From patchwork Thu Oct 10 19:20:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 20351 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VULmW-0007Il-K3; Thu, 10 Oct 2013 21:20:20 +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.72/mailfrontend-8) with esmtp id 1VULmU-0006gG-kY; Thu, 10 Oct 2013 21:20:20 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756314Ab3JJTUQ (ORCPT + 1 other); Thu, 10 Oct 2013 15:20:16 -0400 Received: from mail-ea0-f171.google.com ([209.85.215.171]:47773 "EHLO mail-ea0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755772Ab3JJTUP (ORCPT ); Thu, 10 Oct 2013 15:20:15 -0400 Received: by mail-ea0-f171.google.com with SMTP id n15so1399412ead.30 for ; Thu, 10 Oct 2013 12:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=0io3xI34XPYuexImQATAc1Ob5vRR4xCTEvr+ycQK6lY=; b=skfFxh1usQ/7uHZonB+hWeaEr8fbQZ+P6JfAonD4N053/IjFzH52cSWew6AlKWZyZo 7RgSsUv2aQoni2/c4GwdccN6P/CFFYBPlKM2cFj8Rld/+/XcG1kJhqV+LWTBefgEsmQo 46p7CTm1Z9SmjuJuWV4s30UHjysjo18XTgnoWYAuXKUvEU30oQLm6DAOsJey7bzKx6Oi xd3P+7dlqAmJ15oncKpS/2ISp+WC6160F/f1l5kyHKmE8dmQTCQYkXzUZosYDDLFJRmy 4PXBM7wOpgaNf5fnACPt11EgPN7NYfR5cy/EQ6rRIO5V4buhfZ++gIAbtNvLGOKerAmT SNFg== X-Received: by 10.15.31.12 with SMTP id x12mr118921eeu.83.1381432813233; Thu, 10 Oct 2013 12:20:13 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-109-91-213-248.unitymediagroup.de. [109.91.213.248]) by mx.google.com with ESMTPSA id f49sm105020868eec.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Oct 2013 12:20:12 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: m.chehab@samsung.com, hans.verkuil@cisco.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [RFC PATCH] em28xx: fix device initialization in em28xx_v4l2_open() for radio and VBI mode Date: Thu, 10 Oct 2013 21:20:24 +0200 Message-Id: <1381432824-7395-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: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.10.10.191222 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_1900_1999 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_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, __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' - bail out on unsupported VFL_TYPE - em28xx_set_mode() needs to be called for VBI and radio mode, too - em28xx_wake_i2c() needs to be called for VBI and radio mode, too - em28xx_resolution_set() also needs to be called for VBI Compilation tested only and should be reviewed thoroughly ! Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-video.c | 17 +++++++++++------ 1 Datei geändert, 11 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index fc5d60e..962f4b2 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -1570,13 +1570,16 @@ static int em28xx_v4l2_open(struct file *filp) case VFL_TYPE_VBI: fh_type = V4L2_BUF_TYPE_VBI_CAPTURE; break; + case VFL_TYPE_RADIO: + break; + default: + return -EINVAL; } em28xx_videodbg("open dev=%s type=%s users=%d\n", video_device_node_name(vdev), v4l2_type_names[fh_type], dev->users); - if (mutex_lock_interruptible(&dev->lock)) return -ERESTARTSYS; fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL); @@ -1590,15 +1593,17 @@ static int em28xx_v4l2_open(struct file *filp) fh->type = fh_type; filp->private_data = fh; - if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->users == 0) { + if (dev->users == 0) { em28xx_set_mode(dev, EM28XX_ANALOG_MODE); - em28xx_resolution_set(dev); - /* Needed, since GPIO might have disabled power of - some i2c device + if (vdev->vfl_type != VFL_TYPE_RADIO) + em28xx_resolution_set(dev); + + /* + * Needed, since GPIO might have disabled power of + * some i2c devices */ em28xx_wake_i2c(dev); - } if (vdev->vfl_type == VFL_TYPE_RADIO) {