summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/soc_camera
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-09-14 12:00:24 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-20 14:24:17 -0200
commit57f1b1c8fd705f48eb9fcd87d054e1dc46b1cedc (patch)
treeb20ed28d133fa643eb90b22b5e889bcef01b014b /drivers/media/platform/soc_camera
parentc9a8d89673276a8a9410c68521c0b9523ed10493 (diff)
downloadblackbird-op-linux-57f1b1c8fd705f48eb9fcd87d054e1dc46b1cedc.tar.gz
blackbird-op-linux-57f1b1c8fd705f48eb9fcd87d054e1dc46b1cedc.zip
[media] media: sh-mobile-ceu-camera: runtime PM suspending doesn't have to be synchronous
In both error and clean up cases there is no need to wait for runtime PM to finish suspending the device. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/soc_camera')
-rw-r--r--drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 2d8861c0e8f2..bf66cb4b63e0 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -572,7 +572,7 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
ret = v4l2_subdev_call(csi2_sd, core, s_power, 1);
if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV) {
- pm_runtime_put_sync(ici->v4l2_dev.dev);
+ pm_runtime_put(ici->v4l2_dev.dev);
return ret;
}
@@ -612,7 +612,7 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
}
spin_unlock_irq(&pcdev->lock);
- pm_runtime_put_sync(ici->v4l2_dev.dev);
+ pm_runtime_put(ici->v4l2_dev.dev);
dev_info(icd->parent,
"SuperH Mobile CEU driver detached from camera %d\n",
OpenPOWER on IntegriCloud