summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/libertas/if_cs.c
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2012-04-10 00:51:07 +0400
committerJohn W. Linville <linville@tuxdriver.com>2012-04-12 23:06:07 +0400
commita7b957a277215da1830596c0791307a999fe5153 (patch)
treea5675f24770760ff356cf34fc0a43a4bba378cad /drivers/net/wireless/libertas/if_cs.c
parentd144f536e38a8e6fcd6e8e4c9035f107be9f7d62 (diff)
downloadlinux-a7b957a277215da1830596c0791307a999fe5153.tar.xz
wireless, libertas: remove redundant NULL tests before calling release_firmware()
release_firmware() tests for, and deals gracefully with, NULL pointers. Remove redundant explicit tests before calling the function. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/if_cs.c')
-rw-r--r--drivers/net/wireless/libertas/if_cs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 234ee88dec95..171a06b8879d 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -951,10 +951,8 @@ out2:
out1:
pcmcia_disable_device(p_dev);
out:
- if (helper)
- release_firmware(helper);
- if (mainfw)
- release_firmware(mainfw);
+ release_firmware(helper);
+ release_firmware(mainfw);
lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);
return ret;