summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2009-03-05 19:38:38 +0100
committerPierre Ossman <drzeus@drzeus.cx>2009-03-24 21:30:00 +0100
commitc8d718f1037950107f13607ff0b696ffe63df76a (patch)
treeb0d6cf5baf2d0453fb6c1d98e5e6f6884679d79b /drivers/mmc
parentsdio: handle cis end marker in link field (diff)
downloadlinux-c8d718f1037950107f13607ff0b696ffe63df76a.tar.xz
linux-c8d718f1037950107f13607ff0b696ffe63df76a.zip
sdio: handle null tuples
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/core/sdio_cis.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index 6ba93f599281..963f2937c5e3 100644
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -223,6 +223,10 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
if (tpl_code == 0xff)
break;
+ /* null entries have no link field or data */
+ if (tpl_code == 0x00)
+ continue;
+
ret = mmc_io_rw_direct(card, 0, 0, ptr++, 0, &tpl_link);
if (ret)
break;