summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-10 10:42:24 +0700
committerMark Brown <broonie@kernel.org>2016-03-10 10:42:24 +0700
commit3ee20abb063acc57a45ccb2fdab2eb3ce29e85fa (patch)
tree799c3aeda11614dce6abd8dbaec50d9255100f38
parentc23663ace8adda3bca15e7ad6a99663f6119612d (diff)
parent844c9f476a43db0bdf61df409026a026ce98ec1b (diff)
downloadlinux-sh-3ee20abb063acc57a45ccb2fdab2eb3ce29e85fa.tar.gz
Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus
-rw-r--r--drivers/spi/spi-rockchip.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 79a8bc4f6cec..7cb1b2d710c1 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)
return 0;
err_register_master:
+ pm_runtime_disable(&pdev->dev);
if (rs->dma_tx.ch)
dma_release_channel(rs->dma_tx.ch);
if (rs->dma_rx.ch)
@@ -778,6 +779,8 @@ static int rockchip_spi_remove(struct platform_device *pdev)
if (rs->dma_rx.ch)
dma_release_channel(rs->dma_rx.ch);
+ spi_master_put(master);
+
return 0;
}