summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorQinglang Miao <miaoqinglang@huawei.com>2020-11-03 15:49:12 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 11:51:05 +0100
commit0a3196271b40b681ed9e06ffcbb2c9f0c2b67d41 (patch)
tree5843cae463aa4837e658002ba84f9e79ec90af89 /drivers/spi
parenta2cf358aacf565a7bb2573983ae022b32ac2c228 (diff)
downloadlinux-stable-0a3196271b40b681ed9e06ffcbb2c9f0c2b67d41.tar.gz
linux-stable-0a3196271b40b681ed9e06ffcbb2c9f0c2b67d41.tar.bz2
linux-stable-0a3196271b40b681ed9e06ffcbb2c9f0c2b67d41.zip
spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe
[ Upstream commit 702b15cb97123cedcec56a39d9a21c5288eb9ae1 ] Fix the missing clk_disable_unprepare() before return from mt7621_spi_probe in the error handling case. Fixes: cbd66c626e16 ("spi: mt7621: Move SPI driver out of staging") Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> Link: https://lore.kernel.org/r/20201103074912.195576-1-miaoqinglang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-mt7621.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-mt7621.c b/drivers/spi/spi-mt7621.c
index 2c3b7a2a1ec7..2cdae7994e2a 100644
--- a/drivers/spi/spi-mt7621.c
+++ b/drivers/spi/spi-mt7621.c
@@ -353,6 +353,7 @@ static int mt7621_spi_probe(struct platform_device *pdev)
master = spi_alloc_master(&pdev->dev, sizeof(*rs));
if (!master) {
dev_info(&pdev->dev, "master allocation failed\n");
+ clk_disable_unprepare(clk);
return -ENOMEM;
}
@@ -377,6 +378,7 @@ static int mt7621_spi_probe(struct platform_device *pdev)
ret = device_reset(&pdev->dev);
if (ret) {
dev_err(&pdev->dev, "SPI reset failed!\n");
+ clk_disable_unprepare(clk);
return ret;
}