qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Update to 2.6.35.3

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22753 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb
2010-08-21 19:25:07 +00:00
parent 6bb84a0225
commit c86adc91db
7 changed files with 35 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
View File

@@ -1,5 +1,10 @@
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
---
drivers/mtd/nand/plat_nand.c | 13 ++++++++++++-
include/linux/mtd/nand.h | 1 +
2 files changed, 13 insertions(+), 1 deletion(-)
--- linux-2.6.35.3.orig/include/linux/mtd/nand.h
+++ linux-2.6.35.3/include/linux/mtd/nand.h
@@ -512,6 +512,7 @@ struct platform_nand_chip {
int chip_delay;
unsigned int options;
@@ -8,14 +13,14 @@
void (*set_parts)(uint64_t size,
struct platform_nand_chip *chip);
void *priv;
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
--- linux-2.6.35.3.orig/drivers/mtd/nand/plat_nand.c
+++ linux-2.6.35.3/drivers/mtd/nand/plat_nand.c
@@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str
}
/* Scan to find existance of the device */
- if (nand_scan(&data->mtd, 1)) {
+ if (nand_scan_ident(&data->mtd, 1, NULL)) {
- if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
+ if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) {
+ res = -ENXIO;
+ goto out;
+ }