projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24712ea
)
wilc1000: Fix memleak in wilc_bus_probe
author
Dinghao Liu
<dinghao.liu@zju.edu.cn>
Thu, 20 Aug 2020 05:52:56 +0000
(13:52 +0800)
committer
Kalle Valo
<kvalo@codeaurora.org>
Thu, 27 Aug 2020 10:02:48 +0000
(13:02 +0300)
When devm_clk_get() returns -EPROBE_DEFER, spi_priv
should be freed just like when wilc_cfg80211_init()
fails.
Fixes:
854d66df74aed
("staging: wilc1000: look for rtc_clk clock in spi mode")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Acked-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link:
https://lore.kernel.org/r/20200820055256.24333-1-dinghao.liu@zju.edu.cn
drivers/net/wireless/microchip/wilc1000/spi.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/microchip/wilc1000/spi.c
b/drivers/net/wireless/microchip/wilc1000/spi.c
index
3f19e3f
..
a18dac0
100644
(file)
--- a/
drivers/net/wireless/microchip/wilc1000/spi.c
+++ b/
drivers/net/wireless/microchip/wilc1000/spi.c
@@
-112,9
+112,10
@@
static int wilc_bus_probe(struct spi_device *spi)
wilc->dev_irq_num = spi->irq;
wilc->rtc_clk = devm_clk_get(&spi->dev, "rtc_clk");
- if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER)
+ if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER) {
+ kfree(spi_priv);
return -EPROBE_DEFER;
- else if (!IS_ERR(wilc->rtc_clk))
+
}
else if (!IS_ERR(wilc->rtc_clk))
clk_prepare_enable(wilc->rtc_clk);
return 0;