hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Guennadi Liakhovetski 2013-04-04 14:21:54 -03:00 committed by Mauro Carvalho Chehab
parent a78fcc1126
commit 90438926e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/soc_camera/soc_camera.c
View File

@ -1177,7 +1177,7 @@ static int soc_camera_probe(struct soc_camera_device *icd)
ssdd->reset(icd->pdev); ssdd->reset(icd->pdev);
mutex_lock(&ici->host_lock); mutex_lock(&ici->host_lock);
ret = soc_camera_add_device(icd); ret = ici->ops->clock_start(ici);
mutex_unlock(&ici->host_lock); mutex_unlock(&ici->host_lock);
if (ret < 0) if (ret < 0)
goto eadd; goto eadd;
@ -1250,7 +1250,7 @@ static int soc_camera_probe(struct soc_camera_device *icd)
icd->field = mf.field; icd->field = mf.field;
} }
soc_camera_remove_device(icd); ici->ops->clock_stop(ici);
mutex_unlock(&ici->host_lock); mutex_unlock(&ici->host_lock);
@ -1273,7 +1273,7 @@ eadddev:
icd->vdev = NULL; icd->vdev = NULL;
evdc: evdc:
mutex_lock(&ici->host_lock); mutex_lock(&ici->host_lock);
soc_camera_remove_device(icd); ici->ops->clock_stop(ici);
mutex_unlock(&ici->host_lock); mutex_unlock(&ici->host_lock);
eadd: eadd:
v4l2_ctrl_handler_free(&icd->ctrl_handler); v4l2_ctrl_handler_free(&icd->ctrl_handler);