---

yaml --- r: 322786 b: refs/heads/master c: f107238 h: refs/heads/master v: v3
git-mirror · Sep 5, 2012 · 095cbde · 095cbde
1 parent 7d66940
commit 095cbde
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efd5d6b03bd9c9e0df646c56fb5f4f3e25e5c1ac
+refs/heads/master: f10723841e624c0726c70356b31d91befed01dd6
diff --git a/trunk/drivers/net/wireless/libertas/if_sdio.c b/trunk/drivers/net/wireless/libertas/if_sdio.c
@@ -1326,6 +1326,11 @@ static int if_sdio_suspend(struct device *dev)
 
 	mmc_pm_flag_t flags = sdio_get_host_pm_caps(func);
 
+	/* If we're powered off anyway, just let the mmc layer remove the
+	 * card. */
+	if (!lbs_iface_active(card->priv))
+		return -ENOSYS;
+
 	dev_info(dev, "%s: suspend: PM flags = 0x%x\n",
 		 sdio_func_id(func), flags);