projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-block.git]
/
fs
/
jffs
/
jffs_fm.c
diff --git
a/fs/jffs/jffs_fm.c
b/fs/jffs/jffs_fm.c
index 077258b2103e5bac0d386a46102f4741292e5b2d..5a95fbdd6fdba7b7d94830e55c6bb6e7ace11efb 100644
(file)
--- a/
fs/jffs/jffs_fm.c
+++ b/
fs/jffs/jffs_fm.c
@@
-17,6
+17,7
@@
*
*/
#include <linux/slab.h>
+#include <linux/err.h>
#include <linux/blkdev.h>
#include <linux/jffs.h>
#include "jffs_fm.h"
@@
-104,7
+105,7
@@
jffs_build_begin(struct jffs_control *c, int unit)
mtd = get_mtd_device(NULL, unit);
- if (
!mtd
) {
+ if (
IS_ERR(mtd)
) {
kfree(fmc);
DJM(no_jffs_fmcontrol--);
return NULL;