diff options
| author |   Alexey Khoroshilov <khoroshilov@ispras.ru> | 2018-03-17 13:05:44 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2018-03-18 17:57:42 -0700 |
| commit | 7c2861a6fb2c502d7b7aa85415e178f3c527a468 (patch) | |
| tree | 7a825cd1d21d5f2a5e82e39abdf003b0aaabb1df /drivers/spi/spi-jcore.c | |
| parent | Linux 4.16-rc1 (diff) | |
| download | linux-dev-7c2861a6fb2c502d7b7aa85415e178f3c527a468.tar.xz linux-dev-7c2861a6fb2c502d7b7aa85415e178f3c527a468.zip | |
spi: jcore: disable ref_clk after getting its rate
The driver does not disable ref_clk on remove.
According to the comment, the only reason to enable the clock is to get
its rate. So, it should be safe to disable clk just after that.
By the way, clk_prepare_enable() looks to be more appropriate
than clk_enable() here.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-jcore.c')
| -rw-r--r-- | drivers/spi/spi-jcore.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/spi/spi-jcore.c b/drivers/spi/spi-jcore.c index dafed6280df3..702fe573a47b 100644 --- a/drivers/spi/spi-jcore.c +++ b/drivers/spi/spi-jcore.c @@ -184,10 +184,11 @@ static int jcore_spi_probe(struct platform_device *pdev) */ clock_freq = 50000000; clk = devm_clk_get(&pdev->dev, "ref_clk"); - if (!IS_ERR_OR_NULL(clk)) { - if (clk_enable(clk) == 0) + if (!IS_ERR(clk)) { + if (clk_prepare_enable(clk) == 0) { clock_freq = clk_get_rate(clk); - else + clk_disable_unprepare(clk); + } else dev_warn(&pdev->dev, "could not enable ref_clk\n"); } hw->clock_freq = clock_freq; @@ -198,10 +199,8 @@ static int jcore_spi_probe(struct platform_device *pdev) /* Register our spi controller */ err = devm_spi_register_master(&pdev->dev, master); - if (err) { - clk_disable(clk); + if (err) goto exit; - } return 0; |