diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-23 13:11:51 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-23 13:11:51 +0000 |
| commit | 79feff84d18b7b834da765114a892650eb720b77 (patch) | |
| tree | 609a4d09038dcd04e3a92f96c175ce46ffe011e2 /packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch | |
| parent | 3d47489f97efa97b856febf65edcd66c1bd48f76 (diff) | |
linux-rp: merge .23 and .23+git from poky
Diffstat (limited to 'packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch')
| -rw-r--r-- | packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch b/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch new file mode 100644 index 0000000000..ac2245f088 --- /dev/null +++ b/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch @@ -0,0 +1,29 @@ +--- + drivers/mmc/core/sd.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +Index: linux-2.6.23/drivers/mmc/core/sd.c +=================================================================== +--- linux-2.6.23.orig/drivers/mmc/core/sd.c 2007-10-17 11:33:26.000000000 +0200 ++++ linux-2.6.23/drivers/mmc/core/sd.c 2007-10-17 11:33:49.000000000 +0200 +@@ -173,14 +173,15 @@ + + scr_struct = UNSTUFF_BITS(resp, 60, 4); + if (scr_struct != 0) { +- printk(KERN_ERR "%s: unrecognised SCR structure version %d\n", ++ printk(KERN_WARNING "%s: unrecognised SCR structure version %d\n", + mmc_hostname(card->host), scr_struct); +- return -EINVAL; ++ scr->sda_vsn = 0; ++ scr->bus_widths = 0; ++ } else { ++ scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4); ++ scr->bus_widths = UNSTUFF_BITS(resp, 48, 4); + } + +- scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4); +- scr->bus_widths = UNSTUFF_BITS(resp, 48, 4); +- + return 0; + } + |