diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
commit | ffe732c2430c55074bebb172d33d909c662cd0e3 (patch) | |
tree | d39087d7b5d8caa505b23b6ea2abc2e33efa5be5 /drivers/spi/spi-mxs.c | |
parent | 40ea2b42d7c44386cf81d5636d574193da2c8df2 (diff) | |
parent | 757dfcaa41844595964f1220f1d33182dae49976 (diff) | |
download | blackbird-op-linux-ffe732c2430c55074bebb172d33d909c662cd0e3.tar.gz blackbird-op-linux-ffe732c2430c55074bebb172d33d909c662cd0e3.zip |
Merge branch 'sched/urgent' into sched/core
Merge the latest batch of fixes before applying development patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/spi/spi-mxs.c')
-rw-r--r-- | drivers/spi/spi-mxs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index 73afb56c08cc..3adebfa22e3d 100644 --- a/drivers/spi/spi-mxs.c +++ b/drivers/spi/spi-mxs.c @@ -565,7 +565,7 @@ static int mxs_spi_remove(struct platform_device *pdev) struct mxs_spi *spi; struct mxs_ssp *ssp; - master = spi_master_get(platform_get_drvdata(pdev)); + master = platform_get_drvdata(pdev); spi = spi_master_get_devdata(master); ssp = &spi->ssp; |