From: Hans Verkuil Date: Wed, 18 Mar 2009 18:48:01 +0000 (-0300) Subject: V4L/DVB (11098): v4l2-common: remove incorrect MODULE test X-Git-Tag: v2.6.30-rc1~621^2~171 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=d64260d58865004c6354e024da3450fdd607ea07;hp=76717b887cccc77d04357fc0d6ac98f894e3eb3c;p=safe%2Fjmp%2Flinux-2.6 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index b097825..1da8cb8 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, struct i2c_board_info info; BUG_ON(!dev); -#ifdef MODULE + if (module_name) request_module(module_name); -#endif + /* Setup the i2c board info with the device type and the device address. */ memset(&info, 0, sizeof(info)); @@ -850,10 +850,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter, struct i2c_board_info info; BUG_ON(!dev); -#ifdef MODULE + if (module_name) request_module(module_name); -#endif + /* Setup the i2c board info with the device type and the device address. */ memset(&info, 0, sizeof(info));