netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] p54: Fix an error handling path in p54spi_probe()
@ 2022-06-12 21:12 Christophe JAILLET
  2022-06-13 20:02 ` Christian Lamparter
  2022-07-18 11:51 ` [v2] wifi: " Kalle Valo
  0 siblings, 2 replies; 12+ messages in thread
From: Christophe JAILLET @ 2022-06-12 21:12 UTC (permalink / raw)
  To: Christian Lamparter, Kalle Valo, David S. Miller, Eric Dumazet,
	Jakub Kicinski, Paolo Abeni, John W. Linville
  Cc: linux-kernel, kernel-janitors, Christophe JAILLET,
	Christian Lamparter, linux-wireless, netdev

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 firmawre

Fixes: cd8d3d321285 ("p54spi: p54spi driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
v2: reduce diffstat and take advantage on the fact that release_firmware()
checks for NULL
---
 drivers/net/wireless/intersil/p54/p54spi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2022-07-18 11:51 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-12 21:12 [PATCH v2] p54: Fix an error handling path in p54spi_probe() Christophe JAILLET
2022-06-13 20:02 ` Christian Lamparter
2022-06-13 20:57   ` Christophe JAILLET
2022-06-14  6:15     ` Kalle Valo
2022-06-14  7:25     ` Dan Carpenter
2022-06-15 21:03     ` Christian Lamparter
2022-06-15 21:12       ` Johannes Berg
2022-06-16 10:36       ` Dan Carpenter
2022-06-16 13:13         ` Christian Lamparter
2022-06-16 15:19           ` Dan Carpenter
2022-06-16 19:35             ` Christophe JAILLET
2022-07-18 11:51 ` [v2] wifi: " Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).