Commit 3ee20abb authored by Mark Brown's avatar Mark Brown

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

parents c23663ac 844c9f47
...@@ -749,6 +749,7 @@ static int rockchip_spi_probe(struct platform_device *pdev) ...@@ -749,6 +749,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
return 0; return 0;
err_register_master: err_register_master:
pm_runtime_disable(&pdev->dev);
if (rs->dma_tx.ch) if (rs->dma_tx.ch)
dma_release_channel(rs->dma_tx.ch); dma_release_channel(rs->dma_tx.ch);
if (rs->dma_rx.ch) if (rs->dma_rx.ch)
...@@ -778,6 +779,8 @@ static int rockchip_spi_remove(struct platform_device *pdev) ...@@ -778,6 +779,8 @@ static int rockchip_spi_remove(struct platform_device *pdev)
if (rs->dma_rx.ch) if (rs->dma_rx.ch)
dma_release_channel(rs->dma_rx.ch); dma_release_channel(rs->dma_rx.ch);
spi_master_put(master);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment