Commit 7587fbf5 authored by Sakari Ailus's avatar Sakari Ailus Committed by Hans Verkuil
Browse files

media: ccs: Avoid deadlock in ccs_init_state() 



The sub-device state lock has been already acquired when ccs_init_state()
is called. Do not try to acquire it again.

Reported-by: default avatarDavid Heidelberg <david@ixit.cz>
Fixes: a88883d1 ("media: ccs: Rely on sub-device state locking")
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 7c39f485

drivers/media/i2c/ccs/ccs-core.c

+0 −2
Original line number Diff line number Diff line
@@ -3080,8 +3080,6 @@ static int ccs_init_state(struct v4l2_subdev *sd, 
	struct v4l2_rect *crop =

		v4l2_subdev_state_get_crop(sd_state, pad);



	guard(mutex)(&sensor->mutex);



	ccs_get_native_size(ssd, crop);



	fmt->width = crop->width;