git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/mxs', 'spi/topic/pxa', 'spi/topic/rockchip...
[sfrench/cifs-2.6.git]
/
drivers
/
spi
/
spi-rockchip.c
diff --git
a/drivers/spi/spi-rockchip.c
b/drivers/spi/spi-rockchip.c
index 87bc16f491f0ce8e3d78733d434a67189632e756..80637e9406e2c56cd83f855628e211837b77a28b 100644
(file)
--- a/
drivers/spi/spi-rockchip.c
+++ b/
drivers/spi/spi-rockchip.c
@@
-749,8
+749,6
@@
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;
}