Skip to content

Commit 7587fbf

Browse files
Sakari AilusHans Verkuil
authored andcommitted
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: David Heidelberg <[email protected]> Fixes: a88883d ("media: ccs: Rely on sub-device state locking") Signed-off-by: Sakari Ailus <[email protected]> Signed-off-by: Hans Verkuil <[email protected]>
1 parent 7c39f48 commit 7587fbf

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3080,8 +3080,6 @@ static int ccs_init_state(struct v4l2_subdev *sd,
30803080
struct v4l2_rect *crop =
30813081
v4l2_subdev_state_get_crop(sd_state, pad);
30823082

3083-
guard(mutex)(&sensor->mutex);
3084-
30853083
ccs_get_native_size(ssd, crop);
30863084

30873085
fmt->width = crop->width;

0 commit comments

Comments
 (0)