From 03c58d76b3d4b503b07fba713572740e32218e4b Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Mon, 5 Jul 2010 12:01:22 +0400
Subject: [PATCH] --- yaml --- r: 203833 b: refs/heads/master c:
 278be27fc401119c985235ee549dc229d85e6bf5 h: refs/heads/master i:   203831:
 1dd4fd39302ba032ec824845ff2f2a45ad001dd1 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/bluetooth/btmrvl_sdio.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8f506806dd8c..8936fbb82902 100644
--- 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
index df0773ebd9e4..47f0f917dec9 100644
--- 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;