diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 19:13:22 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 19:13:22 (GMT) |
| commit | 20e0ec119b2c6cc412addefbe169f4f5e38701e8 (patch) | |
| tree | fd8b882f4027f1a60857cbcd3bb85a83261db07f /drivers/spi/spi_nuc900.c | |
| parent | 829ae2732998e628d762b97627e4e5cc6c1b5625 (diff) | |
| parent | 43c640157d4366a3ea9ba01f903ea892f46376ee (diff) | |
| download | linux-fsl-qoriq-20e0ec119b2c6cc412addefbe169f4f5e38701e8.tar.xz | |
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
* 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
spi/amba-pl022: work in polling or interrupt mode if pl022_dma_probe fails
spi/spi_s3c24xx: Use spi_bitbang_stop instead of spi_unregister_master in s3c24xx_spi_remove
spi/spi_nuc900: Use spi_bitbang_stop instead of spi_unregister_master in nuc900_spi_remove
spi/spi_tegra: use spi_unregister_master() instead of spi_master_put()
spi/spi_sh: use spi_unregister_master instead of spi_master_put in remove path
spi: Use void pointers for data in simple SPI I/O operations
spi/pl022: use cpu_relax in the busy loop
spi/pl022: mark driver non-experimental
spi/pl022: timeout on polled transfer v2
spi/dw_spi: improve the interrupt mode with the batch ops
spi/dw_spi: change poll mode transfer from byte ops to batch ops
spi/dw_spi: remove the un-necessary flush()
spi/dw_spi: unify the low level read/write routines
Diffstat (limited to 'drivers/spi/spi_nuc900.c')
| -rw-r--r-- | drivers/spi/spi_nuc900.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_nuc900.c b/drivers/spi/spi_nuc900.c index d5be18b..3cd15f6 100644 --- a/drivers/spi/spi_nuc900.c +++ b/drivers/spi/spi_nuc900.c @@ -463,7 +463,7 @@ static int __devexit nuc900_spi_remove(struct platform_device *dev) platform_set_drvdata(dev, NULL); - spi_unregister_master(hw->master); + spi_bitbang_stop(&hw->bitbang); clk_disable(hw->clk); clk_put(hw->clk); |