mmc: sdio: don't require CISTPL_VERS_1 to contain 4 strings
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> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a54fed9f70
commit
a1125b1e41
|
@ -29,6 +29,8 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,
|
||||||
unsigned i, nr_strings;
|
unsigned i, nr_strings;
|
||||||
char **buffer, *string;
|
char **buffer, *string;
|
||||||
|
|
||||||
|
/* Find all null-terminated (including zero length) strings in
|
||||||
|
the TPLLV1_INFO field. Trailing garbage is ignored. */
|
||||||
buf += 2;
|
buf += 2;
|
||||||
size -= 2;
|
size -= 2;
|
||||||
|
|
||||||
|
@ -39,11 +41,8 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,
|
||||||
if (buf[i] == 0)
|
if (buf[i] == 0)
|
||||||
nr_strings++;
|
nr_strings++;
|
||||||
}
|
}
|
||||||
|
if (nr_strings == 0)
|
||||||
if (nr_strings < 4) {
|
|
||||||
printk(KERN_WARNING "SDIO: ignoring broken CISTPL_VERS_1\n");
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
|
||||||
|
|
||||||
size = i;
|
size = i;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue