]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[MTD] Make OTP actually work.
authorNicolas Pitre <nico@cam.org>
Thu, 17 Feb 2005 20:35:04 +0000 (20:35 +0000)
committerThomas Gleixner <tglx@mtd.linutronix.de>
Mon, 23 May 2005 10:39:55 +0000 (12:39 +0200)
The OTP code is rather broken without this.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/mtd/chips/cfi_cmdset_0001.c

index b3f5acf0760cf51bdd480cc2ae6bedf15f312377..f018ea162173ac55ee531c38b9c4f0fec8f602fb 100644 (file)
@@ -4,7 +4,7 @@
  *
  * (C) 2000 Red Hat. GPL'd
  *
- * $Id: cfi_cmdset_0001.c,v 1.167 2005/02/08 17:11:15 nico Exp $
+ * $Id: cfi_cmdset_0001.c,v 1.168 2005/02/17 20:34:59 nico Exp $
  *
  * 
  * 10/10/2000  Nicolas Pitre <nico@cam.org>
@@ -2025,7 +2025,7 @@ do_otp_lock(struct map_info *map, struct flchip *chip, u_long offset,
        map_word datum;
 
        /* make sure area matches group boundaries */
-       if (offset != 0 || size != grpsz)
+       if (size != grpsz)
                return -EXDEV;
 
        datum = map_word_ff(map);
@@ -2089,7 +2089,7 @@ static int cfi_intelext_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,
                                groupno = 0;
                        }
 
-                       while (groups > 0) {
+                       while (len > 0 && groups > 0) {
                                if (!action) {
                                        /*
                                         * Special case: if action is NULL
@@ -2118,6 +2118,7 @@ static int cfi_intelext_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,
                                        *retlen += sizeof(*otpinfo);
                                } else if (from >= groupsize) {
                                        from -= groupsize;
+                                       data_offset += groupsize;
                                } else {
                                        int size = groupsize;
                                        data_offset += from;
@@ -2133,6 +2134,7 @@ static int cfi_intelext_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,
                                        buf += size;
                                        len -= size;
                                        *retlen += size;
+                                       data_offset += size;
                                }
                                groupno++;
                                groups--;