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>

2 files changed, 10 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index aa71ab52fd76..7a52a66aa991 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12630,6 +12630,14 @@ S:	Maintained
 F:      drivers/ssb/
 F:      include/linux/ssb/
 
+SONY IMX274 SENSOR DRIVER
+M:      Leon Luo <leonl@leopardimaging.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/i2c/imx274.c
+F:      Documentation/devicetree/bindings/media/i2c/imx274.txt
+
 SONY MEMORYSTICK CARD SUPPORT
 M:      Alex Dubov <oakad@yahoo.com>
 W:      http://tifmxx.berlios.de/
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,
         return 0;
 
 err_ctrls:
-        v4l2_async_unregister_subdev(sd);
-        v4l2_ctrl_handler_free(sd->ctrl_handler);
+        v4l2_ctrl_handler_free(&imx274->ctrls.handler);
 err_me:
         media_entity_cleanup(&sd->entity);
 err_regmap:
@@ -1788,7 +1787,7 @@ static int imx274_remove(struct i2c_client *client)
         imx274_write_table(imx274, mode_table[IMX274_MODE_STOP_STREAM]);
 
         v4l2_async_unregister_subdev(sd);
-        v4l2_ctrl_handler_free(sd->ctrl_handler);
+        v4l2_ctrl_handler_free(&imx274->ctrls.handler);
         media_entity_cleanup(&sd->entity);
         mutex_destroy(&imx274->lock);
         return 0;