From patchwork Fri Jan 4 21:15:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 1934841 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2F475DFABD for ; Fri, 4 Jan 2013 21:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755287Ab3ADVQ1 (ORCPT ); Fri, 4 Jan 2013 16:16:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3616 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755066Ab3ADVQ1 (ORCPT ); Fri, 4 Jan 2013 16:16:27 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r04LGQGP023219 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Jan 2013 16:16:26 -0500 Received: from pedra (vpn1-6-240.gru2.redhat.com [10.97.6.240]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r04LGP61014124 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 4 Jan 2013 16:16:26 -0500 Received: from v4l by pedra with local (Exim 4.76) (envelope-from ) id 1TrEcP-00010V-DL; Fri, 04 Jan 2013 19:15:57 -0200 From: Mauro Carvalho Chehab Cc: =?UTF-8?q?Frank=20Sch=C3=A4fer?= , Mauro Carvalho Chehab , Linux Media Mailing List Subject: [PATCH 2/4] [media] em28xx: autoload em28xx-rc if the device has an I2C IR Date: Fri, 4 Jan 2013 19:15:50 -0200 Message-Id: <1357334152-3811-3-git-send-email-mchehab@redhat.com> In-Reply-To: <1357334152-3811-1-git-send-email-mchehab@redhat.com> References: <1357334152-3811-1-git-send-email-mchehab@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- drivers/media/usb/em28xx/em28xx-cards.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index f5cac47..e17be07 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 */ }