diff options
author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2017-11-01 05:40:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-11-30 04:45:12 -0500 |
commit | 781b045baefdabf7e0bc9f33672ca830d3db9f27 (patch) | |
tree | 5d5ccf38a29c9cdca312d5bdf622902614a1c4d9 /drivers | |
parent | 487cc857851f6ca7850636bd111e7a4bfadab4da (diff) |
media: imx274: Fix error handling, add MAINTAINERS entry
Add the missing MAINTAINERS entry for imx274, fix error handling in driver
probe and unregister the correct control handler in driver remove.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/i2c/imx274.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c index 800b9bf9cdd3..2f71af2f90bf 100644 --- a/drivers/media/i2c/imx274.c +++ b/drivers/media/i2c/imx274.c | |||
@@ -1770,8 +1770,7 @@ static int imx274_probe(struct i2c_client *client, | |||
1770 | return 0; | 1770 | return 0; |
1771 | 1771 | ||
1772 | err_ctrls: | 1772 | err_ctrls: |
1773 | v4l2_async_unregister_subdev(sd); | 1773 | v4l2_ctrl_handler_free(&imx274->ctrls.handler); |
1774 | v4l2_ctrl_handler_free(sd->ctrl_handler); | ||
1775 | err_me: | 1774 | err_me: |
1776 | media_entity_cleanup(&sd->entity); | 1775 | media_entity_cleanup(&sd->entity); |
1777 | err_regmap: | 1776 | err_regmap: |
@@ -1788,7 +1787,7 @@ static int imx274_remove(struct i2c_client *client) | |||
1788 | imx274_write_table(imx274, mode_table[IMX274_MODE_STOP_STREAM]); | 1787 | imx274_write_table(imx274, mode_table[IMX274_MODE_STOP_STREAM]); |
1789 | 1788 | ||
1790 | v4l2_async_unregister_subdev(sd); | 1789 | v4l2_async_unregister_subdev(sd); |
1791 | v4l2_ctrl_handler_free(sd->ctrl_handler); | 1790 | v4l2_ctrl_handler_free(&imx274->ctrls.handler); |
1792 | media_entity_cleanup(&sd->entity); | 1791 | media_entity_cleanup(&sd->entity); |
1793 | mutex_destroy(&imx274->lock); | 1792 | mutex_destroy(&imx274->lock); |
1794 | return 0; | 1793 | return 0; |