Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1125b1e authored by David Vrabel's avatar David Vrabel Committed by Linus Torvalds
Browse files

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: default avatarDavid Vrabel <david.vrabel@csr.com>
Tested-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Tested-by: default avatarBing Zhao <bzhao@marvell.com>
Cc: Roel Kluin <roel.kluin@gmail.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a54fed9f

drivers/mmc/core/sdio_cis.c

+3 −4
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func, 
	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 *card, struct sdio_func *func, 
		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;

	}



	size = i;