target/linux/generic-2.4/patches/115-amd_flash_timeout.patch

   1 diff -u linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c.orig linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c
   2 --- linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c.orig       2004-11-17 12:54:21.000000000 +0100
   3 +++ linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c    2006-10-21 17:55:25.000000000 +0200
   4 @@ -510,7 +510,7 @@
   5            or tells us why it failed. */
   6         dq6 = CMD(1<<6);
   7         dq5 = CMD(1<<5);
   8 -       timeo = jiffies + (HZ/1000); /* setting timeout to 1ms for now */
   9 +       timeo = jiffies + (HZ/1000) + 1; /* setting timeout to 1ms for now */
  10
  11         oldstatus = cfi_read(map, adr);
  12         status = cfi_read(map, adr);
  13 @@ -547,7 +547,7 @@
  14                                 printk(KERN_WARNING "Internal flash device timeout occurred or write operation was performed while flash was programming.\n" );
  15                         }
  16                 } else {
  17 -                       printk(KERN_WARNING "Waiting for write to complete timed out in do_write_oneword.");
  18 +                       printk(KERN_WARNING "Waiting for write to complete timed out in do_write_oneword.\n");
  19
  20                         chip->state = FL_READY;
  21                         wake_up(&chip->wq);
  22 @@ -825,7 +825,7 @@
  23                 chip->state = FL_READY;
  24                 wake_up(&chip->wq);
  25                 cfi_spin_unlock(chip->mutex);
  26 -               printk("waiting for erase to complete timed out.");
  27 +               printk("waiting for erase to complete timed out.\n");
  28                 DISABLE_VPP(map);
  29                 return -EIO;
  30         }
  31 @@ -963,7 +963,7 @@
  32                 }
  33          else
  34          {
  35 -                   printk( "Waiting for erase to complete timed out in do_erase_oneblock.");
  36 +                   printk( "Waiting for erase to complete timed out in do_erase_oneblock.\n");
  37
  38                 chip->state = FL_READY;
  39                 wake_up(&chip->wq);