diff options
| author | Frank Schaefer | 2013-04-11 15:56:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-04-14 20:04:22 -0300 |
| commit | 2b64cbd1da7a026e0779a1ba61e83ac5fcf544e7 (patch) | |
| tree | 1f7a8e1cc6020da14999f0b135a2ca8848e2678b /drivers/media/usb | |
| parent | 7c15b715ef301a7f8bb2dc8de335497ffde568a6 (diff) | |
[media] em28xx: fix snapshot button support
The snapshot button support is currently broken, because module em28xx-rc is
loaded only if the device has remote control support.
Fix it by also loading this module if the device has a snapshot button.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index 1d3866f53c9b..a3c305598b4b 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -2810,7 +2810,8 @@ static void request_module_async(struct work_struct *work) if (dev->board.has_dvb) request_module("em28xx-dvb"); - if ((dev->board.ir_codes || dev->board.has_ir_i2c) && !disable_ir) + if (dev->board.has_snapshot_button || + ((dev->board.ir_codes || dev->board.has_ir_i2c) && !disable_ir)) request_module("em28xx-rc"); #endif /* CONFIG_MODULES */ } |