openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: smiapp: Use __v4l2_ctrl_handler_setup() 

Use unlocked __v4l2_ctrl_handler_setup() in order to make the
control setup atomic.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Sakari Ailus 2017-09-29 11:54:10 +02:00 committed by Mauro Carvalho Chehab
parent 61065fc3e3
commit 72eaf99f04
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/media/i2c/smiapp/smiapp-core.c
View File

@ -1325,24 +1325,28 @@ static int smiapp_power_on(struct device *dev)
if (!sensor->pixel_array)
return 0;
rval = v4l2_ctrl_handler_setup(&sensor->pixel_array->ctrl_handler);
if (rval)
goto out_cci_addr_fail;
rval = v4l2_ctrl_handler_setup(&sensor->src->ctrl_handler);
if (rval)
goto out_cci_addr_fail;
mutex_lock(&sensor->mutex);
rval = __v4l2_ctrl_handler_setup(&sensor->pixel_array->ctrl_handler);
if (rval)
goto out_unlock;
rval = __v4l2_ctrl_handler_setup(&sensor->src->ctrl_handler);
if (rval)
goto out_unlock;
rval = smiapp_update_mode(sensor);
mutex_unlock(&sensor->mutex);
if (rval < 0)
goto out_cci_addr_fail;
goto out_unlock;
mutex_unlock(&sensor->mutex);
return 0;
out_cci_addr_fail:
out_unlock:
mutex_unlock(&sensor->mutex);
out_cci_addr_fail:
gpiod_set_value(sensor->xshutdown, 0);
clk_disable_unprepare(sensor->ext_clk);