Skip to content

Commit

Permalink
[media] soc_camera: error dev remove and v4l2 call
Browse files Browse the repository at this point in the history
in soc_camera_close(), if ici->ops->remove() removes device firstly,
and then call __soc_camera_power_off(), it has logic error. Since
if remove device, it should disable subdev clk. but in __soc_camera_
power_off(), it will callback v4l2 s_power function which will
read/write subdev registers to control power by i2c. and then
i2c read/write will fail because of clk disable.
So suggest to re-sequence two functions call.
Change-Id: Iee7a6d4fc7c7c1addb5d342621eb8dcd00fa2745

Signed-off-by: Wenbing Wang <wangwb@marvell.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Wenbing Wang authored and Mauro Carvalho Chehab committed Jun 9, 2013
1 parent 697a6d2 commit af44ad5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/platform/soc_camera/soc_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,9 @@ static int soc_camera_close(struct file *file)

if (ici->ops->init_videobuf2)
vb2_queue_release(&icd->vb2_vidq);
ici->ops->remove(icd);

__soc_camera_power_off(icd);

ici->ops->remove(icd);
}

if (icd->streamer == file)
Expand Down

0 comments on commit af44ad5

Please sign in to comment.