Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7b957a2 authored by Jesper Juhl's avatar Jesper Juhl Committed by John W. Linville
Browse files

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: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d144f536

drivers/net/wireless/libertas/if_cs.c

+2 −4
Original line number Diff line number Diff line
@@ -951,9 +951,7 @@ 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);



	lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);

drivers/net/wireless/libertas/if_sdio.c

+2 −4
Original line number Diff line number Diff line
@@ -751,9 +751,7 @@ static int if_sdio_prog_firmware(struct if_sdio_card *card) 
	ret = 0;



out:

	if (helper)

	release_firmware(helper);

	if (mainfw)

	release_firmware(mainfw);



	lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);

drivers/net/wireless/libertas/if_spi.c

+2 −4
Original line number Diff line number Diff line
@@ -1095,9 +1095,7 @@ static int if_spi_init_card(struct if_spi_card *card) 
		goto out;



out:

	if (helper)

	release_firmware(helper);

	if (mainfw)

	release_firmware(mainfw);



	lbs_deb_leave_args(LBS_DEB_SPI, "err %d\n", err);

drivers/net/wireless/libertas/main.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

	}



	return -ENOENT;

}