lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: p54: Fix an error handling path in p54spi_probe()

Browse Source 
[ Upstream commit 83781f0162d080fec7dcb911afd1bc2f5ad04471 ]

If an error occurs after a successful call to p54spi_request_firmware(), it
must be undone by a corresponding release_firmware() as already done in
the error handling path of p54spi_request_firmware() and in the .remove()
function.

Add the missing call in the error handling path and remove it from
p54spi_request_firmware() now that it is the responsibility of the caller
to release the firmware

Fixes: cd8d3d3212 ("p54spi: p54spi driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/297d2547ff2ee627731662abceeab9dbdaf23231.1655068321.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET 2022-06-12 23:12:20 +02:00 committed by Greg Kroah-Hartman
parent 60c9983425
commit 6942c45a22
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/intersil/p54/p54spi.c
View File

@ -164,7 +164,7 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev)
ret = p54_parse_firmware(dev, priv->firmware); ret = p54_parse_firmware(dev, priv->firmware);
if (ret) { if (ret) {
release_firmware(priv->firmware); /* the firmware is released by the caller */
return ret; return ret;
} }
@ -659,6 +659,7 @@ static int p54spi_probe(struct spi_device *spi)
return 0; return 0;
err_free_common: err_free_common:
release_firmware(priv->firmware);
free_irq(gpio_to_irq(p54spi_gpio_irq), spi); free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
err_free_gpio_irq: err_free_gpio_irq:
gpio_free(p54spi_gpio_irq); gpio_free(p54spi_gpio_irq);