diff options
| author |   Shubhrajyoti D <shubhrajyoti@ti.com> | 2011-10-28 17:14:18 +0530 |
|---|---|---|
| committer |   Grant Likely <grant.likely@secretlab.ca> | 2011-10-29 14:07:18 +0200 |
| commit | 751c925cbb3a270f9771e3945494cb44bd9e732a (patch) | |
| tree | 8f50cf84164ad01af3e752ba41f90cf14256d956 /drivers/spi | |
| parent | spi/omap: Use a workqueue per omap2_mcspi controller (diff) | |
| download | linux-dev-751c925cbb3a270f9771e3945494cb44bd9e732a.tar.xz linux-dev-751c925cbb3a270f9771e3945494cb44bd9e732a.zip | |
spi/omap: call pm_runtime_disable in error path and remove
omap mcspi probe() doesnt call pm_runtime disable functions
in case of failure. remove() doesnt call pm_runtime disable. This could
lead to warnings as below on subsequent insmod.
~# insmod spi-omap2-mcspi.ko
[ 255.383671] omap2_mcspi omap2_mcspi.1: Unbalanced pm_runtime_enable!
...
This patch adds the pm_runtime disable() at appropriate stages.
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 0192d1b79ca7..22e17264a20e 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1196,6 +1196,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) err4: spi_master_put(master); err3: + pm_runtime_disable(&pdev->dev); kfree(mcspi->dma_channels); err2: release_mem_region(r->start, resource_size(r)); @@ -1217,6 +1218,7 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev) dma_channels = mcspi->dma_channels; omap2_mcspi_disable_clocks(mcspi); + pm_runtime_disable(&pdev->dev); r = platform_get_resource(pdev, IORESOURCE_MEM, 0); release_mem_region(r->start, resource_size(r)); |