---

yaml --- r: 203833 b: refs/heads/master c: 278be27 h: refs/heads/master i: 203831: 1dd4fd3 v: v3
git-mirror · Jul 21, 2010 · 03c58d7 · 03c58d7
1 parent 1810f5e
commit 03c58d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c2ece5eaec296482077dadc3edd5baa7bd1097
+refs/heads/master: 278be27fc401119c985235ee549dc229d85e6bf5
diff --git a/trunk/drivers/bluetooth/btmrvl_sdio.c b/trunk/drivers/bluetooth/btmrvl_sdio.c
@@ -83,10 +83,10 @@ static int btmrvl_sdio_read_fw_status(struct btmrvl_sdio_card *card, u16 *dat)
 	*dat = 0;
 
 	fws0 = sdio_readb(card->func, CARD_FW_STATUS0_REG, &ret);
+	if (ret)
+		return -EIO;
 
-	if (!ret)
-		fws1 = sdio_readb(card->func, CARD_FW_STATUS1_REG, &ret);
-
+	fws1 = sdio_readb(card->func, CARD_FW_STATUS1_REG, &ret);
 	if (ret)
 		return -EIO;