ar71xx: merge nand scan patch
SVN-Revision: 29122
This commit is contained in:
parent
3b0870f450
commit
62a7795afd
3 changed files with 2 additions and 24 deletions
|
@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struct platform_device *pdev)
|
|||
|
||||
platform_set_drvdata(pdev, info);
|
||||
|
||||
ret = nand_scan_ident(&info->mtd, 1);
|
||||
ret = nand_scan_ident(&info->mtd, 1, NULL);
|
||||
if (ret) {
|
||||
ret = -ENXIO;
|
||||
goto err_free_info;
|
||||
|
|
|
@ -287,7 +287,7 @@ static int __init rb750_nand_probe(struct platform_device *pdev)
|
|||
|
||||
platform_set_drvdata(pdev, info);
|
||||
|
||||
ret = nand_scan_ident(&info->mtd, 1);
|
||||
ret = nand_scan_ident(&info->mtd, 1, NULL);
|
||||
if (ret) {
|
||||
ret = -ENXIO;
|
||||
goto err_free_info;
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
--- a/drivers/mtd/nand/rb4xx_nand.c
|
||||
+++ b/drivers/mtd/nand/rb4xx_nand.c
|
||||
@@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struc
|
||||
|
||||
platform_set_drvdata(pdev, info);
|
||||
|
||||
- ret = nand_scan_ident(&info->mtd, 1);
|
||||
+ ret = nand_scan_ident(&info->mtd, 1, NULL);
|
||||
if (ret) {
|
||||
ret = -ENXIO;
|
||||
goto err_free_info;
|
||||
--- a/drivers/mtd/nand/rb750_nand.c
|
||||
+++ b/drivers/mtd/nand/rb750_nand.c
|
||||
@@ -287,7 +287,7 @@ static int __init rb750_nand_probe(struc
|
||||
|
||||
platform_set_drvdata(pdev, info);
|
||||
|
||||
- ret = nand_scan_ident(&info->mtd, 1);
|
||||
+ ret = nand_scan_ident(&info->mtd, 1, NULL);
|
||||
if (ret) {
|
||||
ret = -ENXIO;
|
||||
goto err_free_info;
|
Loading…
Reference in a new issue