evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wireless, libertas: remove redundant NULL tests before calling release_firmware()

Browse source 
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>
This commit is contained in:
Jesper Juhl 2012-04-09 22:51:07 +02:00 • committed by John W. Linville
parent d144f536e3
commit a7b957a277
4 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/libertas/if_cs.c
View file

@ -951,9 +951,7 @@ out2:
out1: out1:
pcmcia_disable_device(p_dev); pcmcia_disable_device(p_dev);
out: out:
if (helper)
release_firmware(helper); release_firmware(helper);
if (mainfw)
release_firmware(mainfw); release_firmware(mainfw);
lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret); lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);

2
drivers/net/wireless/libertas/if_sdio.c
View file

@ -751,9 +751,7 @@ success:
ret = 0; ret = 0;
out: out:
if (helper)
release_firmware(helper); release_firmware(helper);
if (mainfw)
release_firmware(mainfw); release_firmware(mainfw);
lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret); lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);

2
drivers/net/wireless/libertas/if_spi.c
View file

@ -1095,9 +1095,7 @@ static int if_spi_init_card(struct if_spi_card *card)
goto out; goto out;
out: out:
if (helper)
release_firmware(helper); release_firmware(helper);
if (mainfw)
release_firmware(mainfw); release_firmware(mainfw);
lbs_deb_leave_args(LBS_DEB_SPI, "err %d\n", err); lbs_deb_leave_args(LBS_DEB_SPI, "err %d\n", err);

4
drivers/net/wireless/libertas/main.c
View file

@ -1269,14 +1269,10 @@ int lbs_get_firmware(struct device *dev, const char *user_helper,
fail: fail:
/* Failed */ /* Failed */
if (*helper) {
release_firmware(*helper); release_firmware(*helper);
*helper = NULL; *helper = NULL;
}
if (*mainfw) {
release_firmware(*mainfw); release_firmware(*mainfw);
*mainfw = NULL; *mainfw = NULL;
}
return -ENOENT; return -ENOENT;
} }