The patch titled
mmc: sdio: don't require CISTPL_VERS_1 to contain 4 strings
has been added to the -mm tree. Its filename is
mmc-sdio-dont-require-cistpl_vers_1-to-contain-4-strings.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mmc: sdio: don't require CISTPL_VERS_1 to contain 4 strings
From: David Vrabel <david.vra...@csr.com>
The PC Card 8.0 specification (vol. 4, section 3.2.10) says the
TPLLV1_INFO field of the CISTPL_VERS_1 tuple must contain 4 strings. Some
cards don't have all 4 so just parse as many as we can.
Signed-off-by: David Vrabel <david.vra...@csr.com>
Tested-by: Jonathan Cameron <ji...@cam.ac.uk>
Cc: Roel Kluin <roel.kl...@gmail.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
---
drivers/mmc/core/sdio_cis.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN
drivers/mmc/core/sdio_cis.c~mmc-sdio-dont-require-cistpl_vers_1-to-contain-4-strings
drivers/mmc/core/sdio_cis.c
---
a/drivers/mmc/core/sdio_cis.c~mmc-sdio-dont-require-cistpl_vers_1-to-contain-4-strings
+++ a/drivers/mmc/core/sdio_cis.c
@@ -29,6 +29,8 @@ static int cistpl_vers_1(struct mmc_card
unsigned i, nr_strings;
char **buffer, *string;
+ /* Find all null-terminated (including zero length) strings in
+ the TPLLV1_INFO field. Trailing garbage is ignored. */
buf += 2;
size -= 2;
@@ -39,9 +41,7 @@ static int cistpl_vers_1(struct mmc_card
if (buf[i] == 0)
nr_strings++;
}
-
- if (nr_strings < 4) {
- printk(KERN_WARNING "SDIO: ignoring broken CISTPL_VERS_1\n");
+ if (nr_strings == 0) {
return 0;
}
_
Patches currently in -mm which might be from david.vra...@csr.com are
mmc-sdio-dont-require-cistpl_vers_1-to-contain-4-strings.patch
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
