Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 751c925cbb3a270f9771e3945494cb44bd9e732a

Authored by Shubhrajyoti D
Committed by Grant Likely
1 parent 2856ac13b8
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

drivers/spi/spi-omap2-mcspi.c
Diff comments   View file @ 751c925
... ... @@ -1196,6 +1196,7 @@
1196 1196 err4:
1197 1197 spi_master_put(master);
1198 1198 err3:
  1199 + pm_runtime_disable(&pdev->dev);
1199 1200 kfree(mcspi->dma_channels);
1200 1201 err2:
1201 1202 release_mem_region(r->start, resource_size(r));
... ... @@ -1217,6 +1218,7 @@
1217 1218 dma_channels = mcspi->dma_channels;
1218 1219  
1219 1220 omap2_mcspi_disable_clocks(mcspi);
  1221 + pm_runtime_disable(&pdev->dev);
1220 1222 r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1221 1223 release_mem_region(r->start, resource_size(r));
1222 1224