aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-18 14:48:01 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:28 -0400
commitd64260d58865004c6354e024da3450fdd607ea07 (patch)
tree7bac26dcd03245359d5ff30cc39eae2ce4b97999 /drivers
parent76717b887cccc77d04357fc0d6ac98f894e3eb3c (diff)
V4L/DVB (11098): v4l2-common: remove incorrect MODULE test
v4l2-common doesn't have to be a module for it to call request_module(). Just remove that test. Thanks-to: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/v4l2-common.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index b09782563c29..1da8cb836cb6 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -797,10 +797,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
797 struct i2c_board_info info; 797 struct i2c_board_info info;
798 798
799 BUG_ON(!dev); 799 BUG_ON(!dev);
800#ifdef MODULE 800
801 if (module_name) 801 if (module_name)
802 request_module(module_name); 802 request_module(module_name);
803#endif 803
804 /* Setup the i2c board info with the device type and 804 /* Setup the i2c board info with the device type and
805 the device address. */ 805 the device address. */
806 memset(&info, 0, sizeof(info)); 806 memset(&info, 0, sizeof(info));
@@ -850,10 +850,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
850 struct i2c_board_info info; 850 struct i2c_board_info info;
851 851
852 BUG_ON(!dev); 852 BUG_ON(!dev);
853#ifdef MODULE 853
854 if (module_name) 854 if (module_name)
855 request_module(module_name); 855 request_module(module_name);
856#endif 856
857 /* Setup the i2c board info with the device type and 857 /* Setup the i2c board info with the device type and
858 the device address. */ 858 the device address. */
859 memset(&info, 0, sizeof(info)); 859 memset(&info, 0, sizeof(info));