* [merged] mmc-sdio-dont-require-cistpl_vers_1-to-contain-4-strings.patch removed from -mm tree
@ 2009-10-09 22:05 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2009-10-09 22:05 UTC (permalink / raw)
To: david.vrabel, bzhao, jic23, linux-mmc, roel.kluin, mm-commits
The patch titled
mmc: sdio: don't require CISTPL_VERS_1 to contain 4 strings
has been removed from the -mm tree. Its filename was
mmc-sdio-dont-require-cistpl_vers_1-to-contain-4-strings.patch
This patch was dropped because it was merged into mainline or a subsystem tree
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.vrabel@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.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: David Vrabel <david.vrabel@csr.com>
Tested-by: Jonathan Cameron <jic23@cam.ac.uk>
Tested-by: Bing Zhao <bzhao@marvell.com>
Cc: Roel Kluin <roel.kluin@gmail.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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,11 +41,8 @@ static int cistpl_vers_1(struct mmc_card
if (buf[i] == 0)
nr_strings++;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-10-09 22:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-10-09 22:05 [merged] mmc-sdio-dont-require-cistpl_vers_1-to-contain-4-strings.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).