projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel...
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
spi-lm70llp.c
diff --git
a/drivers/spi/spi-lm70llp.c
b/drivers/spi/spi-lm70llp.c
index
0759b5d
..
41c5765
100644
(file)
--- a/
drivers/spi/spi-lm70llp.c
+++ b/
drivers/spi/spi-lm70llp.c
@@
-222,7
+222,7
@@
static void spi_lm70llp_attach(struct parport *p)
/*
* SPI and bitbang hookup.
*/
/*
* SPI and bitbang hookup.
*/
- pp->bitbang.master =
spi_master_get(master)
;
+ pp->bitbang.master =
master
;
pp->bitbang.chipselect = lm70_chipselect;
pp->bitbang.txrx_word[SPI_MODE_0] = lm70_txrx;
pp->bitbang.flags = SPI_3WIRE;
pp->bitbang.chipselect = lm70_chipselect;
pp->bitbang.txrx_word[SPI_MODE_0] = lm70_txrx;
pp->bitbang.flags = SPI_3WIRE;