Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af44ad5e authored by Wenbing Wang's avatar Wenbing Wang Committed by Mauro Carvalho Chehab
Browse files

[media] soc_camera: error dev remove and v4l2 call 



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: default avatarWenbing Wang <wangwb@marvell.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 697a6d23

drivers/media/platform/soc_camera/soc_camera.c

+2 −2
Original line number Diff line number Diff line
@@ -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)