aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2013-04-04 13:21:54 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-21 14:47:10 -0400
commit90438926e807bca4f80237f436bc7d904151fc2b (patch)
treeea853df5492f1e1499984e2c6885b2dc63ed7818 /drivers/media
parenta78fcc11264b824d9651b55abfeedd16d5cd8415 (diff)
[media] soc-camera: don't attach the client to the host during probing
During client probing we only have to turn on the host's clock, no need to actually attach the client to the host. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/soc_camera/soc_camera.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 24393a14aaf6..fa8a728b7a5d 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1177,7 +1177,7 @@ static int soc_camera_probe(struct soc_camera_device *icd)
1177 ssdd->reset(icd->pdev); 1177 ssdd->reset(icd->pdev);
1178 1178
1179 mutex_lock(&ici->host_lock); 1179 mutex_lock(&ici->host_lock);
1180 ret = soc_camera_add_device(icd); 1180 ret = ici->ops->clock_start(ici);
1181 mutex_unlock(&ici->host_lock); 1181 mutex_unlock(&ici->host_lock);
1182 if (ret < 0) 1182 if (ret < 0)
1183 goto eadd; 1183 goto eadd;
@@ -1250,7 +1250,7 @@ static int soc_camera_probe(struct soc_camera_device *icd)
1250 icd->field = mf.field; 1250 icd->field = mf.field;
1251 } 1251 }
1252 1252
1253 soc_camera_remove_device(icd); 1253 ici->ops->clock_stop(ici);
1254 1254
1255 mutex_unlock(&ici->host_lock); 1255 mutex_unlock(&ici->host_lock);
1256 1256
@@ -1273,7 +1273,7 @@ eadddev:
1273 icd->vdev = NULL; 1273 icd->vdev = NULL;
1274evdc: 1274evdc:
1275 mutex_lock(&ici->host_lock); 1275 mutex_lock(&ici->host_lock);
1276 soc_camera_remove_device(icd); 1276 ici->ops->clock_stop(ici);
1277 mutex_unlock(&ici->host_lock); 1277 mutex_unlock(&ici->host_lock);
1278eadd: 1278eadd:
1279 v4l2_ctrl_handler_free(&icd->ctrl_handler); 1279 v4l2_ctrl_handler_free(&icd->ctrl_handler);