---

yaml --- r: 140463 b: refs/heads/master c: 0d6132b h: refs/heads/master i: 140461: b46501b 140459: 0ca886b 140455: 8a47ad6 140447: 69f9936 v: v3
git-mirror · Mar 24, 2009 · 4b6933c · 4b6933c
1 parent b0da731
commit 4b6933c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;