diff options
| author | Kulikov Vasiliy <segooon@gmail.com> | 2010-07-05 12:01:22 +0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-07-21 10:39:05 -0700 |
| commit | 278be27fc401119c985235ee549dc229d85e6bf5 (patch) | |
| tree | f116dc2be29768d32f2d574022fc1f48651b0cb1 /drivers/bluetooth/btmrvl_sdio.c | |
| parent | 32c2ece5eaec296482077dadc3edd5baa7bd1097 (diff) | |
| download | kernel_goldelico_gta04-278be27fc401119c985235ee549dc229d85e6bf5.zip kernel_goldelico_gta04-278be27fc401119c985235ee549dc229d85e6bf5.tar.gz kernel_goldelico_gta04-278be27fc401119c985235ee549dc229d85e6bf5.tar.bz2 | |
Bluetooth: Silence warning in btmrvl SDIO driver
Clone checking of ret to simplify the code.
This patch silences a compiler warning:
drivers/bluetooth/btmrvl_sdio.c: In function ‘btmrvl_sdio_verify_fw_download’:
drivers/bluetooth/btmrvl_sdio.c:80: warning: ‘fws1’ may be used uninitialized in this function
drivers/bluetooth/btmrvl_sdio.c:80: note: ‘fws1’ was declared here
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/btmrvl_sdio.c')
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index df0773e..47f0f91 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/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; |