Commit 72eaf99f authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab

media: smiapp: Use __v4l2_ctrl_handler_setup()

Use unlocked __v4l2_ctrl_handler_setup() in order to make the
control setup atomic.
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 61065fc3
......@@ -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);
mutex_lock(&sensor->mutex);
rval = __v4l2_ctrl_handler_setup(&sensor->pixel_array->ctrl_handler);
if (rval)
goto out_cci_addr_fail;
goto out_unlock;
rval = v4l2_ctrl_handler_setup(&sensor->src->ctrl_handler);
rval = __v4l2_ctrl_handler_setup(&sensor->src->ctrl_handler);
if (rval)
goto out_cci_addr_fail;
goto out_unlock;
mutex_lock(&sensor->mutex);
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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment