diff options
author | Richard Purdie <richard@openedhand.com> | 2008-01-20 15:25:36 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-01-20 15:25:36 +0000 |
commit | 388339b8f62705597453e5d627724c8dae90ced8 (patch) | |
tree | 5fc2348228c23ae599a1993ad1c17b192a1ec77d /meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/mmcsd_no_scr_check-r2.patch | |
parent | 05c49eaac2d5bb58929b69cbd67dc4fe62cc8a6d (diff) | |
download | openembedded-core-388339b8f62705597453e5d627724c8dae90ced8.tar.gz openembedded-core-388339b8f62705597453e5d627724c8dae90ced8.tar.bz2 openembedded-core-388339b8f62705597453e5d627724c8dae90ced8.tar.xz openembedded-core-388339b8f62705597453e5d627724c8dae90ced8.zip |
linux-rp-2.6.23+2.6.24-rc6 -> linux-rp-2.6.23+2.6.24-rc8 and some defconfig tweaks
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3556 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/mmcsd_no_scr_check-r2.patch')
-rw-r--r-- | meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/mmcsd_no_scr_check-r2.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/mmcsd_no_scr_check-r2.patch b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/mmcsd_no_scr_check-r2.patch new file mode 100644 index 000000000..ac2245f08 --- /dev/null +++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/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; + } + |