diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2013-04-04 14:21:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-21 15:47:10 -0300 |
| commit | 90438926e807bca4f80237f436bc7d904151fc2b (patch) | |
| tree | ea853df5492f1e1499984e2c6885b2dc63ed7818 /drivers/media | |
| parent | a78fcc11264b824d9651b55abfeedd16d5cd8415 (diff) | |
| download | linux-90438926e807bca4f80237f436bc7d904151fc2b.tar.bz2 | |
[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.c | 6 |
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) ssdd->reset(icd->pdev); mutex_lock(&ici->host_lock); - ret = soc_camera_add_device(icd); + ret = ici->ops->clock_start(ici); mutex_unlock(&ici->host_lock); if (ret < 0) goto eadd; @@ -1250,7 +1250,7 @@ static int soc_camera_probe(struct soc_camera_device *icd) icd->field = mf.field; } - soc_camera_remove_device(icd); + ici->ops->clock_stop(ici); mutex_unlock(&ici->host_lock); @@ -1273,7 +1273,7 @@ eadddev: icd->vdev = NULL; evdc: mutex_lock(&ici->host_lock); - soc_camera_remove_device(icd); + ici->ops->clock_stop(ici); mutex_unlock(&ici->host_lock); eadd: v4l2_ctrl_handler_free(&icd->ctrl_handler); |