diff options
author | Heiner Kallweit <hkallweit1@gmail.com> | 2015-09-03 16:38:46 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-14 13:57:31 -0400 |
commit | 3c863792e9b882c9256b4396742a4b257fb9c557 (patch) | |
tree | a276d3a01a523a10fcea8f0c0281a2d294804538 | |
parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) |
spi: s3c64xx: clean up runtime PM if driver registration fails
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>
-rw-r--r-- | drivers/spi/spi-s3c64xx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index cd1cfac0447f..8a6ab880601a 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c | |||
@@ -1186,7 +1186,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) | |||
1186 | ret = devm_spi_register_master(&pdev->dev, master); | 1186 | ret = devm_spi_register_master(&pdev->dev, master); |
1187 | if (ret != 0) { | 1187 | if (ret != 0) { |
1188 | dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret); | 1188 | dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret); |
1189 | goto err3; | 1189 | goto err4; |
1190 | } | 1190 | } |
1191 | 1191 | ||
1192 | dev_dbg(&pdev->dev, "Samsung SoC SPI Driver loaded for Bus SPI-%d with %d Slaves attached\n", | 1192 | 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) | |||
1197 | 1197 | ||
1198 | return 0; | 1198 | return 0; |
1199 | 1199 | ||
1200 | err4: | ||
1201 | pm_runtime_disable(&pdev->dev); | ||
1202 | pm_runtime_set_suspended(&pdev->dev); | ||
1200 | err3: | 1203 | err3: |
1201 | clk_disable_unprepare(sdd->src_clk); | 1204 | clk_disable_unprepare(sdd->src_clk); |
1202 | err2: | 1205 | err2: |