[media] em28xx: fix snapshot button support
authorFrank Schaefer <fschaefer.oss@googlemail.com>
Thu, 11 Apr 2013 18:56:01 +0000 (15:56 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 14 Apr 2013 23:04:22 +0000 (20:04 -0300)
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>
drivers/media/usb/em28xx/em28xx-cards.c

index 1d3866f..a3c3055 100644 (file)
@@ -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 */
 }