UBUNTU: Ubuntu-4.15.0-96.97

[mirror_ubuntu-bionic-kernel.git] / drivers / spi / spi-meson-spicc.c

diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c
index 7f84296355025d9f95d660c14587609fd6921975..a5b0df7e6131e56d9eb63abf995dab6d9b89d13b 100644 (file)
--- a/drivers/spi/spi-meson-spicc.c
+++ b/drivers/spi/spi-meson-spicc.c
@@ -574,10 +574,15 @@ static int meson_spicc_probe(struct platform_device *pdev)
                master->max_speed_hz = rate >> 2;
 
        ret = devm_spi_register_master(&pdev->dev, master);
-       if (!ret)
-               return 0;
+       if (ret) {
+               dev_err(&pdev->dev, "spi master registration failed\n");
+               goto out_clk;
+       }
 
-       dev_err(&pdev->dev, "spi master registration failed\n");
+       return 0;
+
+out_clk:
+       clk_disable_unprepare(spicc->core);
 
 out_master:
        spi_master_put(master);