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
/
cfi_cmdset_0001.c
diff --git
a/drivers/mtd/chips/cfi_cmdset_0001.c
b/drivers/mtd/chips/cfi_cmdset_0001.c
index
e71624e
..
a36168e
100644
(file)
--- a/
drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/
drivers/mtd/chips/cfi_cmdset_0001.c
@@
-4,7
+4,7
@@
*
* (C) 2000 Red Hat. GPL'd
*
*
* (C) 2000 Red Hat. GPL'd
*
- * $Id: cfi_cmdset_0001.c,v 1.15
4 2004/08/09 13:19:43
dwmw2 Exp $
+ * $Id: cfi_cmdset_0001.c,v 1.15
3 2004/07/12 21:52:20
dwmw2 Exp $
*
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
*
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
@@
-1554,7
+1554,8
@@
int cfi_intelext_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)
return ret;
instr->state = MTD_ERASE_DONE;
return ret;
instr->state = MTD_ERASE_DONE;
- mtd_erase_callback(instr);
+ if (instr->callback)
+ instr->callback(instr);
return 0;
}
return 0;
}