diff options
| author | Russell King <[email protected]> | 2014-08-05 10:27:13 +0100 |
|---|---|---|
| committer | Russell King <[email protected]> | 2014-08-05 10:27:13 +0100 |
| commit | 7109561524dc57b95fd3f9b61547268b9b6db8ed (patch) | |
| tree | df08f565b2c616b7e68fe35cd428a8c5ba3bfcb1 /drivers/spi/spi-sh-sci.c | |
| parent | 6bf755db4d5e7ccea61fb17727a183b9bd8945b1 (diff) | |
| parent | 3bb70de692f70861f5c5729cd2b870d0104a7cc9 (diff) | |
Merge branches 'fixes' and 'misc' into for-next
Conflicts:
arch/arm/kernel/iwmmxt.S
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
Diffstat (limited to 'drivers/spi/spi-sh-sci.c')
| -rw-r--r-- | drivers/spi/spi-sh-sci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c index 1f56ef651d1a..b83dd733684c 100644 --- a/drivers/spi/spi-sh-sci.c +++ b/drivers/spi/spi-sh-sci.c @@ -175,9 +175,9 @@ static int sh_sci_spi_remove(struct platform_device *dev) { struct sh_sci_spi *sp = platform_get_drvdata(dev); - iounmap(sp->membase); - setbits(sp, PIN_INIT, 0); spi_bitbang_stop(&sp->bitbang); + setbits(sp, PIN_INIT, 0); + iounmap(sp->membase); spi_master_put(sp->bitbang.master); return 0; } |