diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2022-06-12 23:12:20 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2022-07-18 14:51:13 +0300 |
| commit | 83781f0162d080fec7dcb911afd1bc2f5ad04471 (patch) | |
| tree | 051b68eca835012c2060576afd2dab83f9e06a5f /drivers/net/wireless/intersil | |
| parent | 30b5057339002f7b8a3651559582ef6ef30980b5 (diff) | |
| download | linux-83781f0162d080fec7dcb911afd1bc2f5ad04471.tar.gz linux-83781f0162d080fec7dcb911afd1bc2f5ad04471.tar.bz2 linux-83781f0162d080fec7dcb911afd1bc2f5ad04471.zip | |
wifi: p54: Fix an error handling path in p54spi_probe()
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: cd8d3d321285 ("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
Diffstat (limited to 'drivers/net/wireless/intersil')
| -rw-r--r-- | drivers/net/wireless/intersil/p54/p54spi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c index f99b7ba69fc3..19152fd449ba 100644 --- a/drivers/net/wireless/intersil/p54/p54spi.c +++ b/drivers/net/wireless/intersil/p54/p54spi.c @@ -164,7 +164,7 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev) ret = p54_parse_firmware(dev, priv->firmware); if (ret) { - release_firmware(priv->firmware); + /* the firmware is released by the caller */ return ret; } @@ -659,6 +659,7 @@ static int p54spi_probe(struct spi_device *spi) return 0; err_free_common: + release_firmware(priv->firmware); free_irq(gpio_to_irq(p54spi_gpio_irq), spi); err_free_gpio_irq: gpio_free(p54spi_gpio_irq); |