Skip to content

Commit a00a3ad

Browse files
dinghaoliugregkh
authored andcommitted
wilc1000: Fix memleak in wilc_sdio_probe
[ Upstream commit 8d95ab3 ] When devm_clk_get() returns -EPROBE_DEFER, sdio_priv should be freed just like when wilc_cfg80211_init() fails. Fixes: 8692b04 ("staging: wilc1000: look for rtc_clk clock") 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/20200820054819.23365-1-dinghao.liu@zju.edu.cn Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent f0ba7b6 commit a00a3ad

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

  • drivers/net/wireless/microchip/wilc1000

drivers/net/wireless/microchip/wilc1000/sdio.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,10 @@ static int wilc_sdio_probe(struct sdio_func *func,
149149
wilc->dev = &func->dev;
150150

151151
wilc->rtc_clk = devm_clk_get(&func->card->dev, "rtc");
152-
if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER)
152+
if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER) {
153+
kfree(sdio_priv);
153154
return -EPROBE_DEFER;
154-
else if (!IS_ERR(wilc->rtc_clk))
155+
} else if (!IS_ERR(wilc->rtc_clk))
155156
clk_prepare_enable(wilc->rtc_clk);
156157

157158
dev_info(&func->dev, "Driver Initializing success\n");

0 commit comments

Comments
 (0)