diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-18 19:48:01 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 17:43:28 +0200 |
| commit | d64260d58865004c6354e024da3450fdd607ea07 (patch) | |
| tree | 7bac26dcd03245359d5ff30cc39eae2ce4b97999 /drivers/media/video/v4l2-common.c | |
| parent | V4L/DVB (11097): use video_ioctl2 as ioctl handler directly (diff) | |
| download | linux-d64260d58865004c6354e024da3450fdd607ea07.tar.xz linux-d64260d58865004c6354e024da3450fdd607ea07.zip | |
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/media/video/v4l2-common.c')
| -rw-r--r-- | drivers/media/video/v4l2-common.c | 8 |
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, 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)); |