Skip to content

Commit

Permalink
V4L/DVB (13345): soc-camera: sh_mobile_ceu_camera: call pm_runtime_di…
Browse files Browse the repository at this point in the history
…sable

pm_runtime_disable is needed if it failed or removed

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Kuninori Morimoto authored and Mauro Carvalho Chehab committed Nov 26, 2009
1 parent 64ff9ba commit 055e05a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/media/video/sh_mobile_ceu_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -1724,10 +1724,12 @@ static int __devinit sh_mobile_ceu_probe(struct platform_device *pdev)

err = soc_camera_host_register(&pcdev->ici);
if (err)
goto exit_free_irq;
goto exit_free_clk;

return 0;

exit_free_clk:
pm_runtime_disable(&pdev->dev);
exit_free_irq:
free_irq(pcdev->irq, pcdev);
exit_release_mem:
Expand All @@ -1748,6 +1750,7 @@ static int __devexit sh_mobile_ceu_remove(struct platform_device *pdev)
struct sh_mobile_ceu_dev, ici);

soc_camera_host_unregister(soc_host);
pm_runtime_disable(&pdev->dev);
free_irq(pcdev->irq, pcdev);
if (platform_get_resource(pdev, IORESOURCE_MEM, 1))
dma_release_declared_memory(&pdev->dev);
Expand Down

0 comments on commit 055e05a

Please sign in to comment.