vserver 1.9.5.x5

[linux-2.6.git] / drivers / mtd / chips / cfi_cmdset_0020.c

diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index 326eaf7..8c24e18 100644 (file)
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -4,7 +4,7 @@
  *
  * (C) 2000 Red Hat. GPL'd
  *
- * $Id: cfi_cmdset_0020.c,v 1.15 2004/08/09 13:19:43 dwmw2 Exp $
+ * $Id: cfi_cmdset_0020.c,v 1.17 2004/11/20 12:49:04 dwmw2 Exp $
  * 
  * 10/10/2000  Nicolas Pitre <nico@cam.org>
  *     - completely revamped method functions so they are aware and
@@ -788,7 +788,7 @@ retry:
        chip->state = FL_ERASING;
        
        spin_unlock_bh(chip->mutex);
-       schedule_timeout(HZ);
+       msleep(1000);
        spin_lock_bh(chip->mutex);
 
        /* FIXME. Use a timer to check this, and return immediately. */
@@ -1087,7 +1087,7 @@ retry:
        chip->state = FL_LOCKING;
        
        spin_unlock_bh(chip->mutex);
-       schedule_timeout(HZ);
+       msleep(1000);
        spin_lock_bh(chip->mutex);
 
        /* FIXME. Use a timer to check this, and return immediately. */
@@ -1236,7 +1236,7 @@ retry:
        chip->state = FL_UNLOCKING;
        
        spin_unlock_bh(chip->mutex);
-       schedule_timeout(HZ);
+       msleep(1000);
        spin_lock_bh(chip->mutex);
 
        /* FIXME. Use a timer to check this, and return immediately. */
@@ -1401,7 +1401,7 @@ static void cfi_staa_destroy(struct mtd_info *mtd)
 
 static char im_name[]="cfi_cmdset_0020";
 
-int __init cfi_staa_init(void)
+static int __init cfi_staa_init(void)
 {
        inter_module_register(im_name, THIS_MODULE, &cfi_cmdset_0020);
        return 0;