From 7999f54ea59af0ecbb43671fe357885087de12ee Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 6 Jan 2010 18:29:47 +0100 Subject: [PATCH 1/2] fix patch path --- .../patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/generic-2.6/patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch b/target/linux/generic-2.6/patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch index eb9df0eea..909bbc889 100644 --- a/target/linux/generic-2.6/patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch +++ b/target/linux/generic-2.6/patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch @@ -1,5 +1,5 @@ ---- 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 +--- a/drivers/mmc/core/sdio_cis.c 2010-01-05 03:36:51.000000000 +0100 ++++ b/drivers/mmc/core/sdio_cis.c 2010-01-05 03:38:44.000000000 +0100 @@ -123,14 +123,14 @@ vsn = func->card->cccr.sdio_vsn; min_size = (vsn == SDIO_SDIO_REV_1_00) ? 28 : 42; From cc3e4bc548622ce5ce1c2d8fb828235dc806608e Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 6 Jan 2010 18:50:59 +0100 Subject: [PATCH 2/2] fix patch direction --- .../860-sdio-v1_10-no-enable-timeout-val.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/generic-2.6/patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch b/target/linux/generic-2.6/patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch index 909bbc889..5be8b0d00 100644 --- a/target/linux/generic-2.6/patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch +++ b/target/linux/generic-2.6/patches-2.6.31/860-sdio-v1_10-no-enable-timeout-val.patch @@ -4,16 +4,16 @@ vsn = func->card->cccr.sdio_vsn; 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; /* TPLFE_MAX_BLK_SIZE */ func->max_blksize = buf[12] | (buf[13] << 8); /* 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; else func->enable_timeout = jiffies_to_msecs(HZ);