diff options
author | Kuninori Morimoto <morimoto.kuninori@renesas.com> | 2009-11-09 14:13:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-11-26 16:38:03 -0500 |
commit | 055e05a08b462feabbd6b7a33fd2b9f1f23d4476 (patch) | |
tree | a889ec5f82d6c3eb3b3efde22453c1776f810abf /drivers | |
parent | 64ff9ba5f1d771e8405ec766c31f6b32c9708285 (diff) |
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: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/sh_mobile_ceu_camera.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 55afe3e98e16..afdea0d26fc6 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c | |||
@@ -1724,10 +1724,12 @@ static int __devinit sh_mobile_ceu_probe(struct platform_device *pdev) | |||
1724 | 1724 | ||
1725 | err = soc_camera_host_register(&pcdev->ici); | 1725 | err = soc_camera_host_register(&pcdev->ici); |
1726 | if (err) | 1726 | if (err) |
1727 | goto exit_free_irq; | 1727 | goto exit_free_clk; |
1728 | 1728 | ||
1729 | return 0; | 1729 | return 0; |
1730 | 1730 | ||
1731 | exit_free_clk: | ||
1732 | pm_runtime_disable(&pdev->dev); | ||
1731 | exit_free_irq: | 1733 | exit_free_irq: |
1732 | free_irq(pcdev->irq, pcdev); | 1734 | free_irq(pcdev->irq, pcdev); |
1733 | exit_release_mem: | 1735 | exit_release_mem: |
@@ -1748,6 +1750,7 @@ static int __devexit sh_mobile_ceu_remove(struct platform_device *pdev) | |||
1748 | struct sh_mobile_ceu_dev, ici); | 1750 | struct sh_mobile_ceu_dev, ici); |
1749 | 1751 | ||
1750 | soc_camera_host_unregister(soc_host); | 1752 | soc_camera_host_unregister(soc_host); |
1753 | pm_runtime_disable(&pdev->dev); | ||
1751 | free_irq(pcdev->irq, pcdev); | 1754 | free_irq(pcdev->irq, pcdev); |
1752 | if (platform_get_resource(pdev, IORESOURCE_MEM, 1)) | 1755 | if (platform_get_resource(pdev, IORESOURCE_MEM, 1)) |
1753 | dma_release_declared_memory(&pdev->dev); | 1756 | dma_release_declared_memory(&pdev->dev); |