summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-08-23 17:03:48 +0200
committerMark Brown <broonie@kernel.org>2016-08-24 13:37:43 +0200
commit568852b7002414c81084f07c7e39e897229d3b6f (patch)
treebd837786418afbe048a55c6868c1bc9f92158fc7 /drivers/spi
parentspi: octeon: Add ThunderX driver (diff)
downloadlinux-568852b7002414c81084f07c7e39e897229d3b6f.tar.xz
linux-568852b7002414c81084f07c7e39e897229d3b6f.zip
spi: spi-cavium-thunderx: Add missing clk_disable_unprepare()
Add the missing clk_disable_unprepare() before return in the probe error handling case and remove. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-cavium-thunderx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-cavium-thunderx.c b/drivers/spi/spi-cavium-thunderx.c
index eff2a130ef0c..877937706240 100644
--- a/drivers/spi/spi-cavium-thunderx.c
+++ b/drivers/spi/spi-cavium-thunderx.c
@@ -80,6 +80,7 @@ static int thunderx_spi_probe(struct pci_dev *pdev,
return 0;
error:
+ clk_disable_unprepare(p->clk);
spi_master_put(master);
return ret;
}
@@ -93,6 +94,7 @@ static void thunderx_spi_remove(struct pci_dev *pdev)
if (!p)
return;
+ clk_disable_unprepare(p->clk);
/* Put everything in a known state. */
writeq(0, p->register_base + OCTEON_SPI_CFG(p));
}