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.liakhovet...@gmx.de>
---
 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 e503f03..ac98bcb 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1207,7 +1207,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;
@@ -1280,7 +1280,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);
 
@@ -1303,7 +1303,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);
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to