From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 4 Jan 2013 20:32:58 +0000 (-0300)
Subject: [media] em28xx: autoload em28xx-rc if the device has an I2C IR
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=728f9778e273a11a65926ac21574e6ca8d911ebf;p=deliverable%2Flinux.git

[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>
---

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)
 
 	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 */
 }