git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[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
6021b8b
..
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>
*
*
* Author: Jonas Holmberg <jonas.holmberg@axis.com>
*
- * $Id: amd_flash.c,v 1.2
3 2003/06/12 09:24:13
dwmw2 Exp $
+ * $Id: amd_flash.c,v 1.2
6 2004/11/20 12:49:04
dwmw2 Exp $
*
* Copyright (c) 2001 Axis Communications AB
*
*
* Copyright (c) 2001 Axis Communications AB
*
@@
-718,7
+718,7
@@
static struct mtd_info *amd_flash_probe(struct map_info *map)
"memory for MTD erase region info\n", map->name);
kfree(mtd);
map->fldrv_priv = NULL;
"memory for MTD erase region info\n", map->name);
kfree(mtd);
map->fldrv_priv = NULL;
- return
0
;
+ return
NULL
;
}
reg_idx = 0;
}
reg_idx = 0;
@@
-780,8
+780,8
@@
static struct mtd_info *amd_flash_probe(struct map_info *map)
map->fldrv_priv = private;
map->fldrv = &amd_flash_chipdrv;
map->fldrv_priv = private;
map->fldrv = &amd_flash_chipdrv;
- MOD_INC_USE_COUNT;
+ __module_get(THIS_MODULE);
return mtd;
}
return mtd;
}
@@
-1122,7
+1122,7
@@
retry:
timeo = jiffies + (HZ * 20);
spin_unlock_bh(chip->mutex);
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)) {
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;
}
instr->state = MTD_ERASE_DONE;
- if (instr->callback) {
- instr->callback(instr);
- }
+ mtd_erase_callback(instr);
return 0;
}
return 0;
}