aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-omap2-mcspi.c
diff options
context:
space:
mode:
authorShubhrajyoti D <shubhrajyoti@ti.com>2012-08-22 02:05:14 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-22 12:58:03 -0400
commita93a2029de7c7f15eb33331cd0f8114892eaa0f3 (patch)
treeab5e7a57aca7f84f4ac9d0064e7c844473ce6af0 /drivers/spi/spi-omap2-mcspi.c
parent034d3dc9886054384d2a64f2c954ecbb11ce88c8 (diff)
spi: omap2-mcspi: At remove dont use the runtime_autosuspend calls
At remove we shouldnt be using the autosuspend timeout as we are calling pm_runtime_disable immediately after. Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
-rw-r--r--drivers/spi/spi-omap2-mcspi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 9340974404c4..164c15d6a1bb 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1245,8 +1245,7 @@ static int __devexit omap2_mcspi_remove(struct platform_device *pdev)
1245 mcspi = spi_master_get_devdata(master); 1245 mcspi = spi_master_get_devdata(master);
1246 dma_channels = mcspi->dma_channels; 1246 dma_channels = mcspi->dma_channels;
1247 1247
1248 pm_runtime_mark_last_busy(mcspi->dev); 1248 pm_runtime_put_sync(mcspi->dev);
1249 pm_runtime_put_autosuspend(mcspi->dev);
1250 pm_runtime_disable(&pdev->dev); 1249 pm_runtime_disable(&pdev->dev);
1251 1250
1252 spi_unregister_master(master); 1251 spi_unregister_master(master);