Commit 83781f01 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Kalle Valo

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: cd8d3d32 ("p54spi: p54spi driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarChristian Lamparter <chunkeey@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/297d2547ff2ee627731662abceeab9dbdaf23231.1655068321.git.christophe.jaillet@wanadoo.fr
parent 30b50573
...@@ -164,7 +164,7 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev) ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment