From 4b6933c031fb4be9446f9e05dfd064145be74e9e Mon Sep 17 00:00:00 2001
From: Pierre Ossman <drzeus@drzeus.cx>
Date: Thu, 5 Mar 2009 19:37:28 +0100
Subject: [PATCH] --- yaml --- r: 140463 b: refs/heads/master c:
 0d6132ba0b006dd2bea9ba0c7b6b2f690cd95c40 h: refs/heads/master i:   140461:
 b46501b85169b042e50b0f60bdc14460e688b6ba   140459:
 0ca886bed0a5bfcd61e76327e1f5a509c2fb5345   140455:
 8a47ad6c57f2e8f9db437d775c03b53c7d413386   140447:
 69f9936c109815fba225cc481db2c5458a88a7c8 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mmc/core/sdio_cis.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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;