patch-2.4.21 linux-2.4.21/drivers/mtd/chips/jedec.c

Next file: linux-2.4.21/drivers/mtd/chips/jedec_probe.c
Previous file: linux-2.4.21/drivers/mtd/chips/gen_probe.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/drivers/mtd/chips/jedec.c linux-2.4.21/drivers/mtd/chips/jedec.c
@@ -11,7 +11,7 @@
  * not going to guess how to send commands to them, plus I expect they will
  * all speak CFI..
  *
- * $Id: jedec.c,v 1.13 2002/02/08 15:57:21 rkaiser Exp $
+ * $Id: jedec.c,v 1.14 2002/06/27 02:19:12 dwmw2 Exp $
  */
 
 #include <linux/mtd/jedec.h>
@@ -465,8 +465,8 @@
       we call this routine with the JEDEC return still enabled, if two or
       more flashes have a truncated address space the probe test will still
       work */
-   if (base + Size+0x555 < map->size &&
-       base + Size+0x555 < (base & (~(my_bank_size-1))) + my_bank_size)
+   if (base + (Size<<2)+0x555 < map->size &&
+       base + (Size<<2)+0x555 < (base & (~(my_bank_size-1))) + my_bank_size)
    {
       if (flread(base+Size) != flread(base+Size + 0x100) ||
 	  flread(base+Size + 1) != flread(base+Size + 0x101))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)