summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2012-04-09 22:51:19 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-04-12 21:06:08 +0200
commitf5123117091995b94e17c44a43cbf4b5dd736319 (patch)
tree5a698d1f0d9eacae81e0447caa04a73eb9b75010 /drivers/net/wireless/orinoco
parentwireless, mwifiex: drop redundant NULL test before call to release_firmware() (diff)
downloadlinux-f5123117091995b94e17c44a43cbf4b5dd736319.tar.xz
linux-f5123117091995b94e17c44a43cbf4b5dd736319.zip
wireless, orinoco: release_firmware() tests for NULL, remove explicit tests before calls
It is redundant to test for NULL pointers before calling release_firmware() since the function does its own NULL test. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco')
-rw-r--r--drivers/net/wireless/orinoco/fw.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c
index 4df8cf64b56c..400a35217644 100644
--- a/drivers/net/wireless/orinoco/fw.c
+++ b/drivers/net/wireless/orinoco/fw.c
@@ -379,11 +379,8 @@ void orinoco_cache_fw(struct orinoco_private *priv, int ap)
void orinoco_uncache_fw(struct orinoco_private *priv)
{
- if (priv->cached_pri_fw)
- release_firmware(priv->cached_pri_fw);
- if (priv->cached_fw)
- release_firmware(priv->cached_fw);
-
+ release_firmware(priv->cached_pri_fw);
+ release_firmware(priv->cached_fw);
priv->cached_pri_fw = NULL;
priv->cached_fw = NULL;
}