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
This commit was manufactured by cvs2svn to create tag
[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
1c1640e
..
ca710c7
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
5 2004/08/09 13:19:43
dwmw2 Exp $
+ * $Id: amd_flash.c,v 1.2
4 2004/07/12 13:34:30
dwmw2 Exp $
*
* Copyright (c) 2001 Axis Communications AB
*
*
* Copyright (c) 2001 Axis Communications AB
*
@@
-1307,7
+1307,9
@@
static int amd_flash_erase(struct mtd_info *mtd, struct erase_info *instr)
}
instr->state = MTD_ERASE_DONE;
}
instr->state = MTD_ERASE_DONE;
- mtd_erase_callback(instr);
+ if (instr->callback) {
+ instr->callback(instr);
+ }
return 0;
}
return 0;
}