From patchwork Thu Apr 11 19:56:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 17880 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UQNaN-0001vQ-Px; Thu, 11 Apr 2013 21:55:07 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp id 1UQNaN-0001I4-G9; Thu, 11 Apr 2013 21:55:07 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752119Ab3DKTzE (ORCPT + 1 other); Thu, 11 Apr 2013 15:55:04 -0400 Received: from mail-ea0-f179.google.com ([209.85.215.179]:60907 "EHLO mail-ea0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751670Ab3DKTzC (ORCPT ); Thu, 11 Apr 2013 15:55:02 -0400 Received: by mail-ea0-f179.google.com with SMTP id f15so904396eak.24 for ; Thu, 11 Apr 2013 12:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=KWwN9n/Jz1Kaoe6R636v1esCpYHD7+NLdEMH1evpZrQ=; b=ojO9aLf+Sb78wSNNoA1EhZ0/R1bS83jnBjOe5i24R1oLp10VV257nh7UPTLxb+/mv2 7rpQ1nUYiHIcM0N48qkAzR4FCIq6/B9dvmgjJn/M28/cVBq8ARaXlJzSj/eyR5dEQcqs +u5zV+hDK/XnMLMsJYsaW1lYEAhw1H/3iJr6fVtVjkYzfk0rzeH5R6h01gUjIYPEmZAZ I0TAWD+WX0Tj07ykk/zgiwhAY2D2fL68q/SYLyl2MWEMT6QL/arPDEUeUncvnvqNZazP geYrWjxUjKLgYMVqvY5F/qOg1zG415loU156CvqaKBMoUG9jbjkF1u06FDFpy5xaaXUL YdoA== X-Received: by 10.15.31.197 with SMTP id y45mr20083055eeu.18.1365710101338; Thu, 11 Apr 2013 12:55:01 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-109-90-212-181.unitymediagroup.de. [109.90.212.181]) by mx.google.com with ESMTPS id t4sm7475408eel.0.2013.04.11.12.55.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Apr 2013 12:55:00 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH] em28xx: fix snapshot button support Date: Thu, 11 Apr 2013 21:56:01 +0200 Message-Id: <1365710161-4939-1-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.4.11.194520 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' 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 --- drivers/media/usb/em28xx/em28xx-cards.c | 3 ++- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index 085b8fc..2da17af 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 */ }