X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_mtdif2.c;h=e6236902d5682a8076d8b80d6ba427b3028b8ca6;hp=c8bccfefd966b98cea83a46f55be6af8fa5c52b1;hb=db670e4a90555c2809667b3a032e08ca26d23e8c;hpb=0f3e5663a6c6d1fe5b8c8abc1b44c7221c62f808

diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index c8bccfe..e623690 100644
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.c
@@ -15,12 +15,12 @@
 
 // mtd interface for YAFFS2
 
-const char *yaffs_mtdif2_c_version = "$Id: yaffs_mtdif2.c,v 1.2 2005-07-19 20:41:59 charles Exp $";
-
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+const char *yaffs_mtdif2_c_version = "$Id: yaffs_mtdif2.c,v 1.5 2005-07-31 08:38:41 marty Exp $";
  
 #include "yportenv.h"
 
+#ifdef CONFIG_YAFFS_YAFFS1
+
 #include "yaffs_mtdif2.h"
 
 #include "linux/mtd/mtd.h"
@@ -130,7 +130,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
 	T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR),blockNo));	
 	
 	
-	retval = mtd->block_markbad(mtd,blockNo);
+	retval = mtd->block_markbad(mtd,blockNo * dev->nChunksPerBlock * dev->nBytesPerChunk);
 
     if (retval == 0)
     	return YAFFS_OK;
@@ -145,7 +145,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_B
 	int retval;
 	
 	T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR),blockNo));	
-	retval = mtd->block_isbad(mtd,blockNo);
+	retval = mtd->block_isbad(mtd,blockNo* dev->nChunksPerBlock * dev->nBytesPerChunk);
 	
 	if(retval)
 	{