diff --git a/[refs] b/[refs]
index 9dfb37fdbdc8..feeee3c7c9e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b331e69a2313f6e857890c7c2c40e3e2a74367a
+refs/heads/master: 0d6132ba0b006dd2bea9ba0c7b6b2f690cd95c40
diff --git a/trunk/drivers/mmc/core/sdio_cis.c b/trunk/drivers/mmc/core/sdio_cis.c
index 956bd7677502..6ba93f599281 100644
--- a/trunk/drivers/mmc/core/sdio_cis.c
+++ b/trunk/drivers/mmc/core/sdio_cis.c
@@ -227,6 +227,10 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
 		if (ret)
 			break;
 
+		/* a size of 0xff also means we're done */
+		if (tpl_link == 0xff)
+			break;
+
 		this = kmalloc(sizeof(*this) + tpl_link, GFP_KERNEL);
 		if (!this)
 			return -ENOMEM;