Commit 055e05a0 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mauro Carvalho Chehab

V4L/DVB (13345): soc-camera: sh_mobile_ceu_camera: call pm_runtime_disable

pm_runtime_disable is needed if it failed or removed
Signed-off-by: default avatarKuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 64ff9ba5
...@@ -1724,10 +1724,12 @@ static int __devinit sh_mobile_ceu_probe(struct platform_device *pdev) ...@@ -1724,10 +1724,12 @@ static int __devinit sh_mobile_ceu_probe(struct platform_device *pdev)
err = soc_camera_host_register(&pcdev->ici); err = soc_camera_host_register(&pcdev->ici);
if (err) if (err)
goto exit_free_irq; goto exit_free_clk;
return 0; return 0;
exit_free_clk:
pm_runtime_disable(&pdev->dev);
exit_free_irq: exit_free_irq:
free_irq(pcdev->irq, pcdev); free_irq(pcdev->irq, pcdev);
exit_release_mem: exit_release_mem:
...@@ -1748,6 +1750,7 @@ static int __devexit sh_mobile_ceu_remove(struct platform_device *pdev) ...@@ -1748,6 +1750,7 @@ static int __devexit sh_mobile_ceu_remove(struct platform_device *pdev)
struct sh_mobile_ceu_dev, ici); struct sh_mobile_ceu_dev, ici);
soc_camera_host_unregister(soc_host); soc_camera_host_unregister(soc_host);
pm_runtime_disable(&pdev->dev);
free_irq(pcdev->irq, pcdev); free_irq(pcdev->irq, pcdev);
if (platform_get_resource(pdev, IORESOURCE_MEM, 1)) if (platform_get_resource(pdev, IORESOURCE_MEM, 1))
dma_release_declared_memory(&pdev->dev); dma_release_declared_memory(&pdev->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment