[media] mt9v032: Free control handler in cleanup paths
The control handler must be freed in the probe error path and in the remove handler. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Родитель
2660a22b55
Коммит
9462550f66
|
@ -830,8 +830,11 @@ static int mt9v032_probe(struct i2c_client *client,
|
||||||
|
|
||||||
mt9v032->pad.flags = MEDIA_PAD_FL_SOURCE;
|
mt9v032->pad.flags = MEDIA_PAD_FL_SOURCE;
|
||||||
ret = media_entity_init(&mt9v032->subdev.entity, 1, &mt9v032->pad, 0);
|
ret = media_entity_init(&mt9v032->subdev.entity, 1, &mt9v032->pad, 0);
|
||||||
if (ret < 0)
|
|
||||||
|
if (ret < 0) {
|
||||||
|
v4l2_ctrl_handler_free(&mt9v032->ctrls);
|
||||||
kfree(mt9v032);
|
kfree(mt9v032);
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -841,9 +844,11 @@ static int mt9v032_remove(struct i2c_client *client)
|
||||||
struct v4l2_subdev *subdev = i2c_get_clientdata(client);
|
struct v4l2_subdev *subdev = i2c_get_clientdata(client);
|
||||||
struct mt9v032 *mt9v032 = to_mt9v032(subdev);
|
struct mt9v032 *mt9v032 = to_mt9v032(subdev);
|
||||||
|
|
||||||
|
v4l2_ctrl_handler_free(&mt9v032->ctrls);
|
||||||
v4l2_device_unregister_subdev(subdev);
|
v4l2_device_unregister_subdev(subdev);
|
||||||
media_entity_cleanup(&subdev->entity);
|
media_entity_cleanup(&subdev->entity);
|
||||||
kfree(mt9v032);
|
kfree(mt9v032);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче