Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 781b045b authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 487cc857

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -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/

drivers/media/i2c/imx274.c

+2 −3
Original line number Diff line number Diff line
@@ -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;