diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-04 15:32:58 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-04 16:13:14 -0500 |
commit | 728f9778e273a11a65926ac21574e6ca8d911ebf (patch) | |
tree | a3fc215efca095a6a712b15c6229d465e2a3f08d | |
parent | 8303dc9952758ab3060a3ee9a19ecb6fec83c600 (diff) |
[media] em28xx: autoload em28xx-rc if the device has an I2C IR
If the device has an I2C IR, em28xx-rc should be loaded by default,
except if the user explicitly requested to not load, via modprobe
option.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index f5cac47d099a..e17be073c0c3 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c | |||
@@ -2912,7 +2912,7 @@ static void request_module_async(struct work_struct *work) | |||
2912 | 2912 | ||
2913 | if (dev->board.has_dvb) | 2913 | if (dev->board.has_dvb) |
2914 | request_module("em28xx-dvb"); | 2914 | request_module("em28xx-dvb"); |
2915 | if (dev->board.ir_codes && !disable_ir) | 2915 | if ((dev->board.ir_codes || dev->board.has_ir_i2c) && !disable_ir) |
2916 | request_module("em28xx-rc"); | 2916 | request_module("em28xx-rc"); |
2917 | #endif /* CONFIG_MODULES */ | 2917 | #endif /* CONFIG_MODULES */ |
2918 | } | 2918 | } |