upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c
index ca710c7..41e2e3e 100644 (file)
--- a/drivers/mtd/chips/amd_flash.c
+++ b/drivers/mtd/chips/amd_flash.c
@@ -3,7 +3,7 @@
  *
  * Author: Jonas Holmberg <jonas.holmberg@axis.com>
  *
- * $Id: amd_flash.c,v 1.24 2004/07/12 13:34:30 dwmw2 Exp $
+ * $Id: amd_flash.c,v 1.26 2004/11/20 12:49:04 dwmw2 Exp $
  *
  * Copyright (c) 2001 Axis Communications AB
  *
@@ -1122,7 +1122,7 @@ retry:
        timeo = jiffies + (HZ * 20);
 
        spin_unlock_bh(chip->mutex);
-       schedule_timeout(HZ);
+       msleep(1000);
        spin_lock_bh(chip->mutex);
        
        while (flash_is_busy(map, adr, private->interleave)) {
@@ -1307,9 +1307,7 @@ static int amd_flash_erase(struct mtd_info *mtd, struct erase_info *instr)
        }
                
        instr->state = MTD_ERASE_DONE;
-       if (instr->callback) {
-               instr->callback(instr);
-       }
+       mtd_erase_callback(instr);
        
        return 0;
 }