leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: ov9655: fix missing mutex_destroy()

Browse Source 
Fix missing mutex_destroy() when probe fails and
when driver is removed.

Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Hugues Fruchet 2017-07-21 11:49:41 -04:00 committed by Mauro Carvalho Chehab
parent 0a7a13452b
commit 457a1a7ac0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/i2c/ov9650.c
View File

@ -1505,13 +1505,13 @@ static int ov965x_probe(struct i2c_client *client,
ret = ov965x_configure_gpios(ov965x, pdata); ret = ov965x_configure_gpios(ov965x, pdata);
if (ret < 0) if (ret < 0)
return ret; goto err_mutex;
ov965x->pad.flags = MEDIA_PAD_FL_SOURCE; ov965x->pad.flags = MEDIA_PAD_FL_SOURCE;
sd->entity.function = MEDIA_ENT_F_CAM_SENSOR; sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;
ret = media_entity_pads_init(&sd->entity, 1, &ov965x->pad); ret = media_entity_pads_init(&sd->entity, 1, &ov965x->pad);
if (ret < 0) if (ret < 0)
return ret; goto err_mutex;
ret = ov965x_initialize_controls(ov965x); ret = ov965x_initialize_controls(ov965x);
if (ret < 0) if (ret < 0)
@ -1537,16 +1537,20 @@ err_ctrls:
v4l2_ctrl_handler_free(sd->ctrl_handler); v4l2_ctrl_handler_free(sd->ctrl_handler);
err_me: err_me:
media_entity_cleanup(&sd->entity); media_entity_cleanup(&sd->entity);
err_mutex:
mutex_destroy(&ov965x->lock);
return ret; return ret;
} }
static int ov965x_remove(struct i2c_client *client) static int ov965x_remove(struct i2c_client *client)
{ {
struct v4l2_subdev *sd = i2c_get_clientdata(client); struct v4l2_subdev *sd = i2c_get_clientdata(client);
struct ov965x *ov965x = to_ov965x(sd);
v4l2_async_unregister_subdev(sd); v4l2_async_unregister_subdev(sd);
v4l2_ctrl_handler_free(sd->ctrl_handler); v4l2_ctrl_handler_free(sd->ctrl_handler);
media_entity_cleanup(&sd->entity); media_entity_cleanup(&sd->entity);
mutex_destroy(&ov965x->lock);
return 0; return 0;
} }