2.4.26 MTD Patch

[Brad Goodman]

The following patch prevents a kernel OOPS when a faulty MTD device
times-out,
due to a the cleanup in the error path being done twice.

=========== PATCH IS AS FOLLOWS ==========

--- orig/cfi_cmdset_0002.c      Thu Jul 15 12:31:42 2004
+++ cfi_cmdset_0002.c   Thu Jul 15 12:30:48 2004
@@ -6,6 +6,8 @@
  *
  * 2_by_8 routines added by Simon Munton
  *
+ * 7/15/2004 - Brad Goodman <bgoodman at acopia.com> Removed duplicate
cleanup from error path
+ *
  * This code is GPL
  *
  * $Id: cfi_cmdset_0002.c,v 1.62 2003/01/24 23:30:13 dwmw2 Exp $
@@ -549,11 +551,7 @@
                        }
                } else {
                        printk(KERN_WARNING "Waiting for write to
complete timed out in do_write_oneword.");        
-
-                       chip->state = FL_READY;
-                       wake_up(&chip->wq);
-                       cfi_spin_unlock(chip->mutex);
-                       DISABLE_VPP(map);
+
                        ret = -EIO;
                }
        } 
  
--------------------------------------------------------
 
DISCLAIMER:   The information contained in this e-mail is confidential and is intended solely for the review of the named addressee, and in conjunction with specific Acopia Networks business.  Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you are unable to treat this information accordingly, or are not the intended recipient, please notify us immediately by returning the e-mail to the originator.