Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus

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;
 }