[media] em28xx: autoload em28xx-rc if the device has an I2C IR
authorMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 4 Jan 2013 20:32:58 +0000 (17:32 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 4 Jan 2013 21:13:14 +0000 (19:13 -0200)
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>
drivers/media/usb/em28xx/em28xx-cards.c

index f5cac47d099abe6e1033d39f859da6242fd7592a..e17be073c0c3dcf2f76c02bf36bfb65d2f199598 100644 (file)
@@ -2912,7 +2912,7 @@ static void request_module_async(struct work_struct *work)
 
        if (dev->board.has_dvb)
                request_module("em28xx-dvb");
-       if (dev->board.ir_codes && !disable_ir)
+       if ((dev->board.ir_codes || dev->board.has_ir_i2c) && !disable_ir)
                request_module("em28xx-rc");
 #endif /* CONFIG_MODULES */
 }