]> git.karo-electronics.de Git - linux-beck.git/commitdiff
spi: s3c64xx: clean up runtime PM if driver registration fails
authorHeiner Kallweit <hkallweit1@gmail.com>
Thu, 3 Sep 2015 20:38:46 +0000 (22:38 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 14 Sep 2015 17:57:31 +0000 (18:57 +0100)
Fix missing runtime PM cleanup if driver registration fails.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-s3c64xx.c

index cd1cfac0447f98343917c31c83564ab1d6cf21b0..8a6ab880601a2ea4b8b9af25e1ec2863d78cbf18 100644 (file)
@@ -1186,7 +1186,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
        ret = devm_spi_register_master(&pdev->dev, master);
        if (ret != 0) {
                dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);
-               goto err3;
+               goto err4;
        }
 
        dev_dbg(&pdev->dev, "Samsung SoC SPI Driver loaded for Bus SPI-%d with %d Slaves attached\n",
@@ -1197,6 +1197,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 
        return 0;
 
+err4:
+       pm_runtime_disable(&pdev->dev);
+       pm_runtime_set_suspended(&pdev->dev);
 err3:
        clk_disable_unprepare(sdd->src_clk);
 err2: