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_0020.c
diff --git
a/drivers/mtd/chips/cfi_cmdset_0020.c
b/drivers/mtd/chips/cfi_cmdset_0020.c
index
326eaf7
..
98817c2
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
*
*
* (C) 2000 Red Hat. GPL'd
*
- * $Id: cfi_cmdset_0020.c,v 1.1
5 2004/08/09 13:19:43
dwmw2 Exp $
+ * $Id: cfi_cmdset_0020.c,v 1.1
3 2004/07/12 21:52:50
dwmw2 Exp $
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
* - completely revamped method functions so they are aware and
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
* - completely revamped method functions so they are aware and
@@
-966,7
+966,8
@@
int cfi_staa_erase_varsize(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;
}
@@
-1399,6
+1400,11
@@
static void cfi_staa_destroy(struct mtd_info *mtd)
kfree(cfi);
}
kfree(cfi);
}
+#if LINUX_VERSION_CODE < 0x20212 && defined(MODULE)
+#define cfi_staa_init init_module
+#define cfi_staa_exit cleanup_module
+#endif
+
static char im_name[]="cfi_cmdset_0020";
int __init cfi_staa_init(void)
static char im_name[]="cfi_cmdset_0020";
int __init cfi_staa_init(void)