From: Jesper Juhl Date: Mon, 9 Apr 2012 20:49:49 +0000 (+0200) Subject: Bluetooth: btmrvl_sdio: remove pointless conditional before release_firmware() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=59f34fb3354bb7b5f9d865ccaa2c54d3cf691cb8;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Gustavo Padovan --- 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; }