qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 19:37:10 +02:00
Code

ar71xx: merge nand scan patch

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29122 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2011-11-14 17:43:10 +00:00
parent 4686f1d0fc
commit d9b73ec674
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
View File

@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
ret = nand_scan_ident(&info->mtd, 1); ret = nand_scan_ident(&info->mtd, 1, NULL);
if (ret) { if (ret) {
ret = -ENXIO; ret = -ENXIO;
goto err_free_info; goto err_free_info;

2
target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
View File

@ -287,7 +287,7 @@ static int __init rb750_nand_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
ret = nand_scan_ident(&info->mtd, 1); ret = nand_scan_ident(&info->mtd, 1, NULL);
if (ret) { if (ret) {
ret = -ENXIO; ret = -ENXIO;
goto err_free_info; goto err_free_info;

22
target/linux/ar71xx/patches-2.6.39/400-2.6.35-fix-nand_scan_ident-options.patch
View File

@ -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;