diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-18 19:48:01 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-18 19:48:01 +0100 |
| commit | edcff71d60fb21a8813c06ab97fc0d8746c238b4 (patch) | |
| tree | 792019c028cd867f4b9379fa80cef0b3048e4442 /linux | |
| parent | d6571db03763326af6865e6af1b993f29cf48316 (diff) | |
| download | mediapointer-dvb-s2-edcff71d60fb21a8813c06ab97fc0d8746c238b4.tar.gz mediapointer-dvb-s2-edcff71d60fb21a8813c06ab97fc0d8746c238b4.tar.bz2 | |
v4l2-common: remove incorrect MODULE test
From: Hans Verkuil <hverkuil@xs4all.nl>
v4l2-common doesn't have to be a module for it to call request_module().
Just remove that test.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Thanks-to: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index 32d0246d5..426a93e8e 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -828,10 +828,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter, #endif BUG_ON(!dev); -#ifdef MODULE + if (module_name) request_module(module_name); -#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) /* Setup the i2c board info with the device type and the device address. */ @@ -896,10 +896,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter, #endif BUG_ON(!dev); -#ifdef MODULE + if (module_name) request_module(module_name); -#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) /* Setup the i2c board info with the device type and the device address. */ |