generic: bacport SPI bus locking API
[openwrt.git] / target / linux / ar71xx / patches-2.6.35 / 400-2.6.35-fix-nand_scan_ident-options.patch
1 --- a/drivers/mtd/nand/rb4xx_nand.c
2 +++ b/drivers/mtd/nand/rb4xx_nand.c
3 @@ -431,7 +431,7 @@ static int __init rb4xx_nand_probe(struc
4  
5         platform_set_drvdata(pdev, info);
6  
7 -       ret = nand_scan_ident(&info->mtd, 1);
8 +       ret = nand_scan_ident(&info->mtd, 1, NULL);
9         if (ret) {
10                 ret = -ENXIO;
11                 goto err_free_info;
12 --- a/drivers/mtd/nand/rb750_nand.c
13 +++ b/drivers/mtd/nand/rb750_nand.c
14 @@ -287,7 +287,7 @@ static int __init rb750_nand_probe(struc
15  
16         platform_set_drvdata(pdev, info);
17  
18 -       ret = nand_scan_ident(&info->mtd, 1);
19 +       ret = nand_scan_ident(&info->mtd, 1, NULL);
20         if (ret) {
21                 ret = -ENXIO;
22                 goto err_free_info;