Skip to contentSkip to conversation

nand_base: misused maf_id ( for Linux 2.6.18-RC4 & RC5 )

PATCH In review rockeychu 2 participants 2 messages Aug 30, 2006

lore
Share & tools
lore

rockeychu

author
#0 lore raw

PATCH 1/1 nand_base: misused maf_id ( for Linux 2.6.18-RC4 & RC5 )

When finding manufacturer, changed maf_id not maf_idx, so result is not correct.

--- linux-2.6.17_org/drivers/mtd/nand/nand_base.c 2006-08-28
12:29:32.000000000 +0800
+++ linux-2.6.17/drivers/mtd/nand/nand_base.c 2006-08-30 13:09:55.320000000 +0800
@@ -1093,9 +1093,10 @@

        ret = nand_do_read_ops(mtd, from, &chip->ops);

+ *retlen = chip->ops.retlen;
+

        nand_release_device(mtd);
-       *retlen = chip->ops.retlen;
        return ret;

}

@@ -1691,9 +1692,10 @@

        ret = nand_do_write_ops(mtd, to, &chip->ops);

+ *retlen = chip->ops.retlen;
+

        nand_release_device(mtd);
-       *retlen = chip->ops.retlen;
        return ret;

}

@@ -2222,7 +2224,7 @@

        }

        /* Try to identify manufacturer */
-       for (maf_idx = 0; nand_manuf_ids[maf_idx].id != 0x0; maf_id++) {
+       for (maf_idx = 0; nand_manuf_ids[maf_idx].id != 0x0; maf_idx++) {
                if (nand_manuf_ids[maf_idx].id == *maf_id)
                        break;
        }
#1 lore raw
Quoted 20 lines · rockeychu

When finding manufacturer, changed maf_id not maf_idx, so result is not correct.

--- linux-2.6.17_org/drivers/mtd/nand/nand_base.c 2006-08-28
12:29:32.000000000 +0800
+++ linux-2.6.17/drivers/mtd/nand/nand_base.c 2006-08-30 13:09:55.320000000 +0800

(quoted diff) +2 -1
@@ -1093,9 +1093,10 @@
 
        ret = nand_do_read_ops(mtd, from, &chip->ops);
 
+       *retlen = chip->ops.retlen;
+
        nand_release_device(mtd);
 
-       *retlen = chip->ops.retlen;
        return ret;
 }
 

Review line 1700

Quoted 10 lines
(quoted diff) +2 -1
@@ -1691,9 +1692,10 @@
 
        ret = nand_do_write_ops(mtd, to, &chip->ops);
 
+       *retlen = chip->ops.retlen;
+
        nand_release_device(mtd);
 
-       *retlen = chip->ops.retlen;
        return ret;
 }

best to send these to the mtd list.

Review line 2230

Quoted 9 lines
(quoted diff) +1 -1
@@ -2222,7 +2224,7 @@
        }
 
        /* Try to identify manufacturer */
-       for (maf_idx = 0; nand_manuf_ids[maf_idx].id != 0x0; maf_id++) {
+       for (maf_idx = 0; nand_manuf_ids[maf_idx].id != 0x0; maf_idx++) {
                if (nand_manuf_ids[maf_idx].id == *maf_id)
                        break;
        }

This should have already been fixed in the mtd-2.6 git.

Signature · 3 lines
Ben ([email protected], http://www.fluff.org/)

  'a smiley only costs 4 bytes'