]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
spi: sifive: disable clk when probe fails and remove
authorChuhong Yuan <hslester96@gmail.com>
Fri, 1 Nov 2019 12:17:45 +0000 (20:17 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 4 Nov 2019 13:26:11 +0000 (13:26 +0000)
The driver forgets to disable and unprepare clk when probe fails and
remove.
Add the calls to fix the problem.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Reviewed-by: Palmer Dabbelt <palmer@dabbelt.com>
Link: https://lore.kernel.org/r/20191101121745.13413-1-hslester96@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-sifive.c

index 35254bdc42c4890facdde5bbf683cd78c1a81f7a..f7c1e20432e074fdf656037101ecbfa7893dfa85 100644 (file)
@@ -357,14 +357,14 @@ static int sifive_spi_probe(struct platform_device *pdev)
        if (!cs_bits) {
                dev_err(&pdev->dev, "Could not auto probe CS lines\n");
                ret = -EINVAL;
-               goto put_master;
+               goto disable_clk;
        }
 
        num_cs = ilog2(cs_bits) + 1;
        if (num_cs > SIFIVE_SPI_MAX_CS) {
                dev_err(&pdev->dev, "Invalid number of spi slaves\n");
                ret = -EINVAL;
-               goto put_master;
+               goto disable_clk;
        }
 
        /* Define our master */
@@ -393,7 +393,7 @@ static int sifive_spi_probe(struct platform_device *pdev)
                               dev_name(&pdev->dev), spi);
        if (ret) {
                dev_err(&pdev->dev, "Unable to bind to interrupt\n");
-               goto put_master;
+               goto disable_clk;
        }
 
        dev_info(&pdev->dev, "mapped; irq=%d, cs=%d\n",
@@ -402,11 +402,13 @@ static int sifive_spi_probe(struct platform_device *pdev)
        ret = devm_spi_register_master(&pdev->dev, master);
        if (ret < 0) {
                dev_err(&pdev->dev, "spi_register_master failed\n");
-               goto put_master;
+               goto disable_clk;
        }
 
        return 0;
 
+disable_clk:
+       clk_disable_unprepare(spi->clk);
 put_master:
        spi_master_put(master);
 
@@ -420,6 +422,7 @@ static int sifive_spi_remove(struct platform_device *pdev)
 
        /* Disable all the interrupts just in case */
        sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0);
+       clk_disable_unprepare(spi->clk);
 
        return 0;
 }