mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

media: i2c: st-vgxy61: Fix control flow error on probe 

In case of error 'update_hdr' now goes through 'power_off' instead of
returning, effectively shutting down the sensor.

Signed-off-by: Benjamin Mugnier <benjamin.mugnier@foss.st.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Benjamin Mugnier 2023-02-01 15:04:16 +01:00 committed by Mauro Carvalho Chehab
parent 985ed1d743
commit 44b22d45cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/i2c/st-vgxy61.c
View File

@ -1870,11 +1870,11 @@ static int vgxy61_probe(struct i2c_client *client)
vgxy61_fill_framefmt(sensor, sensor->current_mode, &sensor->fmt,
VGXY61_MEDIA_BUS_FMT_DEF);
mutex_init(&sensor->lock);
ret = vgxy61_update_hdr(sensor, sensor->hdr);
if (ret)
return ret;
mutex_init(&sensor->lock);
goto error_power_off;
ret = vgxy61_init_controls(sensor);
if (ret) {
@ -1913,8 +1913,8 @@ error_pm_runtime:
media_entity_cleanup(&sensor->sd.entity);
error_handler_free:
v4l2_ctrl_handler_free(sensor->sd.ctrl_handler);
mutex_destroy(&sensor->lock);
error_power_off:
mutex_destroy(&sensor->lock);
vgxy61_power_off(dev);
return ret;