summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2012-04-09 22:49:49 +0200
committerGustavo Padovan <gustavo@padovan.org>2012-05-09 01:40:31 -0300
commit59f34fb3354bb7b5f9d865ccaa2c54d3cf691cb8 (patch)
tree5361b8023570521b23d908a8405189b471d0fb93 /drivers/bluetooth
parentb76bbd6657a2dd7545686ba9ad59625f44192146 (diff)
downloadlinux-59f34fb3354bb7b5f9d865ccaa2c54d3cf691cb8.tar.gz
linux-59f34fb3354bb7b5f9d865ccaa2c54d3cf691cb8.tar.bz2
linux-59f34fb3354bb7b5f9d865ccaa2c54d3cf691cb8.zip
Bluetooth: btmrvl_sdio: remove pointless conditional before release_firmware()
release_firmware() deals gracefullt with NULL pointers so there's no reason to test for one prior to calling the function. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btmrvl_sdio.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 27b74b0d547b..ed62c7f6a553 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -339,9 +339,7 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card)
done:
kfree(tmphlprbuf);
- if (fw_helper)
- release_firmware(fw_helper);
-
+ release_firmware(fw_helper);
return ret;
}
@@ -484,10 +482,7 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card)
done:
kfree(tmpfwbuf);
-
- if (fw_firmware)
- release_firmware(fw_firmware);
-
+ release_firmware(fw_firmware);
return ret;
}