---

yaml --- r: 27891 b: refs/heads/master c: f75e509 h: refs/heads/master i: 27889: 5f3d800 27887: ce37024 v: v3
git-mirror · May 26, 2006 · eb345ae · eb345ae
1 parent f3544b3
commit eb345ae
Show file tree

Hide file tree

Showing 8 changed files with 309 additions and 549 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4d222ff18bca6322f032088a21e9c4a4c038b85
+refs/heads/master: f75e5097ef298c5a0aa106faa211d1afdc92dc3d
diff --git a/trunk/drivers/mtd/nand/diskonchip.c b/trunk/drivers/mtd/nand/diskonchip.c
@@ -1666,7 +1666,7 @@ static int __init doc_probe(unsigned long physadr)
 	nand->ecc.mode		= NAND_ECC_HW_SYNDROME;
 	nand->ecc.size		= 512;
 	nand->ecc.bytes		= 6;
-	nand->options		= NAND_USE_FLASH_BBT | NAND_HWECC_SYNDROME;
+	nand->options		= NAND_USE_FLASH_BBT;
 
 	doc->physadr		= physadr;
 	doc->virtadr		= virtadr;

diff --git a/trunk/drivers/mtd/nand/edb7312.c b/trunk/drivers/mtd/nand/edb7312.c
@@ -198,9 +198,6 @@ static void __exit ep7312_cleanup(void)
 	/* Release resources, unregister device */
 	nand_release(ap7312_mtd);
 
-	/* Free internal data buffer */
-	kfree(this->data_buf);
-
 	/* Free the MTD device structure */
 	kfree(ep7312_mtd);
 }