From patchwork Fri Jan 17 17:45:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 21646 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1W4DTC-0005Ad-GG; Fri, 17 Jan 2014 18:44:38 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1W4DTA-00010h-6X; Fri, 17 Jan 2014 18:44:38 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752817AbaAQRod (ORCPT + 1 other); Fri, 17 Jan 2014 12:44:33 -0500 Received: from mail-ee0-f50.google.com ([74.125.83.50]:39747 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753134AbaAQRo3 (ORCPT ); Fri, 17 Jan 2014 12:44:29 -0500 Received: by mail-ee0-f50.google.com with SMTP id d17so2246859eek.37 for ; Fri, 17 Jan 2014 09:44:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=/7Qw74qoWjBKQOQitNlxf6KEjYsG0gfpPn/iMXzTNGE=; b=BZdy8nyzqQ7dSLmhdKYyWmmVAyKHwkHU5sTlVyyWzSmrUVv/dwp0Yj5Cq4NiCcAiYo qs/BFOFvV8l+PN81W9g4aqVNWtYdK26UFYXJ1VeZ3nCzeEkPtfhq/vasaj3FMPilpeLN gngoOxm4t8DCrWPid1kqNURBgdeGw4oHNw5MBefYRxmhGmpwNYBv+Lf+772wMot65TA9 6bbarX/uf6JnQsjxTPm4PT4rtF3/QQtBrNnEQgE7KNKz0hXL5HUCtV43IXdmp2Yp0pKW tCTjva1/z8yqWcoYgTXXwZalCMP1RW+OJsaJ0r0gWom8JHl93lfPcGA/gzS+2t0n4/yU sUIA== X-Received: by 10.14.177.200 with SMTP id d48mr4080109eem.8.1389980668513; Fri, 17 Jan 2014 09:44:28 -0800 (PST) Received: from Athlon64X2-5000.site (ip-178-200-115-160.unitymediagroup.de. [178.200.115.160]) by mx.google.com with ESMTPSA id z49sm15841147eeo.10.2014.01.17.09.44.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jan 2014 09:44:28 -0800 (PST) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: m.chehab@samsung.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 3/3] em28xx-v4l: do not call em28xx_init_camera() if the device has no sensor Date: Fri, 17 Jan 2014 18:45:32 +0100 Message-Id: <1389980732-8375-3-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1389980732-8375-1-git-send-email-fschaefer.oss@googlemail.com> References: <1389980732-8375-1-git-send-email-fschaefer.oss@googlemail.com> 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: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.1.17.173615 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_1000_LESS 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, BODY_SIZE_900_999 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 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, __IN_REP_TO 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' This avoids the unnecessary temporary registration of a dummy V4L2 clock. Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-video.c | 3 ++- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 09e18da..2775c90 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -2273,7 +2273,8 @@ static int em28xx_v4l2_init(struct em28xx *dev) } em28xx_tuner_setup(dev); - em28xx_init_camera(dev); + if (dev->em28xx_sensor != EM28XX_NOSENSOR) + em28xx_init_camera(dev); /* Configure audio */ ret = em28xx_audio_setup(dev);