Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

@ -951,10 +951,8 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
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;

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

@ -751,10 +751,8 @@ static int if_sdio_prog_firmware(struct if_sdio_card *card)
ret = 0;
out:
if (helper)
release_firmware(helper);
if (mainfw)
release_firmware(mainfw);
release_firmware(helper);
release_firmware(mainfw);
lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);
return ret;

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

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

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

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