tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by Sakari Ailus and committed by Mauro Carvalho Chehab 781b045b 487cc857

+10 -3
unified split
+8
MAINTAINERS
··· 12630 F: drivers/ssb/ 12631 F: include/linux/ssb/ 12632 12633 SONY MEMORYSTICK CARD SUPPORT 12634 M: Alex Dubov <oakad@yahoo.com> 12635 W: http://tifmxx.berlios.de/
··· 12630 F: drivers/ssb/ 12631 F: include/linux/ssb/ 12632 12633 + SONY IMX274 SENSOR DRIVER 12634 + M: Leon Luo <leonl@leopardimaging.com> 12635 + L: linux-media@vger.kernel.org 12636 + T: git git://linuxtv.org/media_tree.git 12637 + S: Maintained 12638 + F: drivers/media/i2c/imx274.c 12639 + F: Documentation/devicetree/bindings/media/i2c/imx274.txt 12640 + 12641 SONY MEMORYSTICK CARD SUPPORT 12642 M: Alex Dubov <oakad@yahoo.com> 12643 W: http://tifmxx.berlios.de/
+2 -3
drivers/media/i2c/imx274.c
··· 1770 return 0; 1771 1772 err_ctrls: 1773 - v4l2_async_unregister_subdev(sd); 1774 - v4l2_ctrl_handler_free(sd->ctrl_handler); 1775 err_me: 1776 media_entity_cleanup(&sd->entity); 1777 err_regmap: ··· 1787 imx274_write_table(imx274, mode_table[IMX274_MODE_STOP_STREAM]); 1788 1789 v4l2_async_unregister_subdev(sd); 1790 - v4l2_ctrl_handler_free(sd->ctrl_handler); 1791 media_entity_cleanup(&sd->entity); 1792 mutex_destroy(&imx274->lock); 1793 return 0;
··· 1770 return 0; 1771 1772 err_ctrls: 1773 + v4l2_ctrl_handler_free(&imx274->ctrls.handler); 1774 err_me: 1775 media_entity_cleanup(&sd->entity); 1776 err_regmap: ··· 1788 imx274_write_table(imx274, mode_table[IMX274_MODE_STOP_STREAM]); 1789 1790 v4l2_async_unregister_subdev(sd); 1791 + v4l2_ctrl_handler_free(&imx274->ctrls.handler); 1792 media_entity_cleanup(&sd->entity); 1793 mutex_destroy(&imx274->lock); 1794 return 0;