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

3ee20abb · Mark Brown · c23663ac · 844c9f47 · 3ee20abb
Commit 3ee20abb authored Mar 10, 2016 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/spi/spi-rockchip.c drivers/spi/spi-rockchip.c +3 -0

No files found.
--- 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;
 }