qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-01 08:55:19 +02:00
Code

Merge branch 'xburst' of git@projects.qi-hardware.com:openwrt-xburst into xburst

Browse Source
This commit is contained in:
Xiangfu Liu 2010-01-07 20:29:36 +08:00
commit 51cf77023f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/generic-2.6/patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch
View File

@ -1,19 +1,19 @@
--- drivers/mmc/core/sdio_cis.c 2010-01-05 03:36:51.000000000 +0100 --- a/drivers/mmc/core/sdio_cis.c 2010-01-05 03:36:51.000000000 +0100
+++ /opt/Projects/linux-2.6/drivers/mmc/core/sdio_cis.c 2010-01-05 03:38:44.000000000 +0100 +++ b/drivers/mmc/core/sdio_cis.c 2010-01-05 03:38:44.000000000 +0100
@@ -123,14 +123,14 @@ @@ -123,14 +123,14 @@
vsn = func->card->cccr.sdio_vsn; vsn = func->card->cccr.sdio_vsn;
min_size = (vsn == SDIO_SDIO_REV_1_00) ? 28 : 42; min_size = (vsn == SDIO_SDIO_REV_1_00) ? 28 : 42;
- if (buf[0] != 1) - if (size < min_size || buf[0] != 1)
+ if (size < min_size || buf[0] != 1) + if (buf[0] != 1)
return -EINVAL; return -EINVAL;
/* TPLFE_MAX_BLK_SIZE */ /* TPLFE_MAX_BLK_SIZE */
func->max_blksize = buf[12] | (buf[13] << 8); func->max_blksize = buf[12] | (buf[13] << 8);
/* TPLFE_ENABLE_TIMEOUT_VAL, present in ver 1.1 and above */ /* TPLFE_ENABLE_TIMEOUT_VAL, present in ver 1.1 and above */
- if (vsn > SDIO_SDIO_REV_1_00 && size >= min_size) - if (vsn > SDIO_SDIO_REV_1_00)
+ if (vsn > SDIO_SDIO_REV_1_00) + if (vsn > SDIO_SDIO_REV_1_00 && size >= min_size)
func->enable_timeout = (buf[28] | (buf[29] << 8)) * 10; func->enable_timeout = (buf[28] | (buf[29] << 8)) * 10;
else else
func->enable_timeout = jiffies_to_msecs(HZ); func->enable_timeout = jiffies_to_msecs(HZ);