Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 20:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] media: soc-camera: use icd->control instead of icd->pdev for reset()

Browse Source 
icd->control is the sub device dev, i.e. i2c device.
icd->pdev is the soc camera device's device.

To be consitent with power() function, we will call reset() with
icd->control as well.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Josh Wu 2015-02-10 06:31:33 -03:00 committed by Mauro Carvalho Chehab
parent 4f528afcfb
commit 0b9508aa03
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -688,7 +688,8 @@ static int soc_camera_open(struct file *file)
/* The camera could have been already on, try to reset */ /* The camera could have been already on, try to reset */
if (sdesc->subdev_desc.reset) if (sdesc->subdev_desc.reset)
sdesc->subdev_desc.reset(icd->pdev); if (icd->control)
sdesc->subdev_desc.reset(icd->control);
ret = soc_camera_add_device(icd); ret = soc_camera_add_device(icd);
if (ret < 0) { if (ret < 0) {
@ -1159,7 +1160,8 @@ static void scan_add_host(struct soc_camera_host *ici)
/* The camera could have been already on, try to reset */ /* The camera could have been already on, try to reset */
if (ssdd->reset) if (ssdd->reset)
ssdd->reset(icd->pdev); if (icd->control)
ssdd->reset(icd->control);
icd->parent = ici->v4l2_dev.dev; icd->parent = ici->v4l2_dev.dev;
@ -1445,7 +1447,7 @@ static int soc_camera_async_bound(struct v4l2_async_notifier *notifier,
memcpy(&sdesc->subdev_desc, ssdd, memcpy(&sdesc->subdev_desc, ssdd,
sizeof(sdesc->subdev_desc)); sizeof(sdesc->subdev_desc));
if (ssdd->reset) if (ssdd->reset)
ssdd->reset(icd->pdev); ssdd->reset(&client->dev);
} }
icd->control = &client->dev; icd->control = &client->dev;