|
@@ -1010,10 +1010,19 @@ 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)
|
|
|
|
+ goto err;
|
|
|
|
|
|
|
|
+ mt9v032->subdev.dev = &client->dev;
|
|
|
|
+ ret = v4l2_async_register_subdev(&mt9v032->subdev);
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
- v4l2_ctrl_handler_free(&mt9v032->ctrls);
|
|
|
|
|
|
+ goto err;
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
|
|
|
|
+err:
|
|
|
|
+ media_entity_cleanup(&mt9v032->subdev.entity);
|
|
|
|
+ v4l2_ctrl_handler_free(&mt9v032->ctrls);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1022,6 +1031,7 @@ 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_async_unregister_subdev(subdev);
|
|
v4l2_ctrl_handler_free(&mt9v032->ctrls);
|
|
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);
|