projects
/
cascardo
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
c23663a
)
Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus
author
Mark Brown
<broonie@kernel.org>
Thu, 10 Mar 2016 03:42:24 +0000
(10:42 +0700)
committer
Mark Brown
<broonie@kernel.org>
Thu, 10 Mar 2016 03:42:24 +0000
(10:42 +0700)
drivers/spi/spi-rockchip.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-rockchip.c
b/drivers/spi/spi-rockchip.c
index
79a8bc4
..
7cb1b2d
100644
(file)
--- 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;
}