projects
/
firefly-linux-kernel-4.4.55.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
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mtd
/
nand
/
sh_flctl.c
diff --git
a/drivers/mtd/nand/sh_flctl.c
b/drivers/mtd/nand/sh_flctl.c
index 1842df8bdd934fcec9955f445984af556ebf13bb..88c802cd947f5326e183b9aa24d62ee015f8ccdf 100644
(file)
--- a/
drivers/mtd/nand/sh_flctl.c
+++ b/
drivers/mtd/nand/sh_flctl.c
@@
-854,7
+854,7
@@
static int __devinit flctl_probe(struct platform_device *pdev)
nand->read_word = flctl_read_word;
}
- ret = nand_scan_ident(flctl_mtd, 1);
+ ret = nand_scan_ident(flctl_mtd, 1
, NULL
);
if (ret)
goto err;