aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Lin <shawn.lin@rock-chips.com>2016-02-15 03:27:58 -0500
committerMark Brown <broonie@kernel.org>2016-02-15 07:19:53 -0500
commitb8659adda9e295eca0b10a67f3b15a8644c8ed6f (patch)
treeaa19fe86cbdaf5c31a3419a95c7b2a074610bd55
parent92e963f50fc74041b5e9e744c330dca48e04f08d (diff)
spi: rockchip: disable runtime pm when in err case
Before registering master, driver enables runtime pm. This patch pm_runtime_disable in err case while probing driver to balance pm reference count. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-rockchip.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 79a8bc4f6cec..c0f9baee1e91 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -749,6 +749,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
749 return 0; 749 return 0;
750 750
751err_register_master: 751err_register_master:
752 pm_runtime_disable(&pdev->dev);
752 if (rs->dma_tx.ch) 753 if (rs->dma_tx.ch)
753 dma_release_channel(rs->dma_tx.ch); 754 dma_release_channel(rs->dma_tx.ch);
754 if (rs->dma_rx.ch) 755 if (rs->dma_rx.ch)