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

[media] smiapp: Clean up smiapp_init_controls() 

Clean up smiapp_init_controls() by adding newlines to appropriate places and
by removing superfluous error handling. The caller will clean up control
handlers in any case if the function fails.

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 2014-12-09 14:35:43 -03:00 committed by Mauro Carvalho Chehab
parent f7350a034a
commit 6208aebd33
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,6 +527,7 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
rval = v4l2_ctrl_handler_init(&sensor->pixel_array->ctrl_handler, 12); rval = v4l2_ctrl_handler_init(&sensor->pixel_array->ctrl_handler, 12);
if (rval) if (rval)
return rval; return rval;
sensor->pixel_array->ctrl_handler.lock = &sensor->mutex; sensor->pixel_array->ctrl_handler.lock = &sensor->mutex;
sensor->analog_gain = v4l2_ctrl_new_std( sensor->analog_gain = v4l2_ctrl_new_std(
@ -585,8 +586,7 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
dev_err(&client->dev, dev_err(&client->dev,
"pixel array controls initialization failed (%d)\n", "pixel array controls initialization failed (%d)\n",
sensor->pixel_array->ctrl_handler.error); sensor->pixel_array->ctrl_handler.error);
rval = sensor->pixel_array->ctrl_handler.error; return sensor->pixel_array->ctrl_handler.error;
goto error;
} }
sensor->pixel_array->sd.ctrl_handler = sensor->pixel_array->sd.ctrl_handler =
@ -596,7 +596,8 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
rval = v4l2_ctrl_handler_init(&sensor->src->ctrl_handler, 0); rval = v4l2_ctrl_handler_init(&sensor->src->ctrl_handler, 0);
if (rval) if (rval)
goto error; return rval;
sensor->src->ctrl_handler.lock = &sensor->mutex; sensor->src->ctrl_handler.lock = &sensor->mutex;
for (max = 0; sensor->platform_data->op_sys_clock[max + 1]; max++); for (max = 0; sensor->platform_data->op_sys_clock[max + 1]; max++);
@ -614,20 +615,12 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
dev_err(&client->dev, dev_err(&client->dev,
"src controls initialization failed (%d)\n", "src controls initialization failed (%d)\n",
sensor->src->ctrl_handler.error); sensor->src->ctrl_handler.error);
rval = sensor->src->ctrl_handler.error; return sensor->src->ctrl_handler.error;
goto error;
} }
sensor->src->sd.ctrl_handler = sensor->src->sd.ctrl_handler = &sensor->src->ctrl_handler;
&sensor->src->ctrl_handler;
return 0; return 0;
error:
v4l2_ctrl_handler_free(&sensor->pixel_array->ctrl_handler);
v4l2_ctrl_handler_free(&sensor->src->ctrl_handler);
return rval;
} }
static void smiapp_free_controls(struct smiapp_sensor *sensor) static void smiapp_free_controls(struct smiapp_sensor *sensor)