diff options
author | Jesper Juhl <jj@chaosbits.net> | 2012-04-09 16:49:49 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo@padovan.org> | 2012-05-09 00:40:31 -0400 |
commit | 59f34fb3354bb7b5f9d865ccaa2c54d3cf691cb8 (patch) | |
tree | 5361b8023570521b23d908a8405189b471d0fb93 /drivers/bluetooth/btmrvl_sdio.c | |
parent | b76bbd6657a2dd7545686ba9ad59625f44192146 (diff) |
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/btmrvl_sdio.c')
-rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 9 |
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) | |||
339 | 339 | ||
340 | done: | 340 | done: |
341 | kfree(tmphlprbuf); | 341 | kfree(tmphlprbuf); |
342 | if (fw_helper) | 342 | release_firmware(fw_helper); |
343 | release_firmware(fw_helper); | ||
344 | |||
345 | return ret; | 343 | return ret; |
346 | } | 344 | } |
347 | 345 | ||
@@ -484,10 +482,7 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card) | |||
484 | 482 | ||
485 | done: | 483 | done: |
486 | kfree(tmpfwbuf); | 484 | kfree(tmpfwbuf); |
487 | 485 | release_firmware(fw_firmware); | |
488 | if (fw_firmware) | ||
489 | release_firmware(fw_firmware); | ||
490 | |||
491 | return ret; | 486 | return ret; |
492 | } | 487 | } |
493 | 488 | ||