From patchwork Fri Jul 25 18:08:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 25064 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XAjuK-0001GK-KB; Fri, 25 Jul 2014 20:07:52 +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-7) with esmtp id 1XAjuI-0001X9-0Y; Fri, 25 Jul 2014 20:07:52 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753744AbaGYSHs (ORCPT + 1 other); Fri, 25 Jul 2014 14:07:48 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:44796 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752914AbaGYSHr (ORCPT ); Fri, 25 Jul 2014 14:07:47 -0400 Received: by mail-wi0-f170.google.com with SMTP id f8so1495496wiw.3 for ; Fri, 25 Jul 2014 11:07:46 -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=GNS8Em7NQ7/DBVqSBc/lWWSY8ZDAKNQUzDQt4S2Syco=; b=dbkcFHh57BhaF7BLCDWPKHMYU8UxNft7uwSAvhpZf/4wI8zx62/3StPtbEaWCNntpP Njo9kibjfRC5H8pFUvWnA6aLPaHlCef6JC1Hn3xckkjLj3kyWE9BgR4J58eKcy/9rtDa RWifNxxMfqFN+0DZXAflkk7UK9FSwIvxEfc4snKIq29JtKRWZUAaShQLluJ1IR5bAieO RQabu1PDR+3FAo56rgZTbYFIvyi+H0HUzJ7OprPGMoIP9vcv56XdflotB95BUuECSliv 4bExV55x/x4DUGm+wmzkgPbrQPqqDHJcFoyOpoGLKqW9QwMUb0mFxix/TCWm0DQFAuPj vyBg== X-Received: by 10.194.205.132 with SMTP id lg4mr24908809wjc.80.1406311666555; Fri, 25 Jul 2014 11:07:46 -0700 (PDT) Received: from Athlon64X2-5000.lan (ip-178-201-166-251.hsi08.unitymediagroup.de. [178.201.166.251]) by mx.google.com with ESMTPSA id o12sm8657982wiw.5.2014.07.25.11.07.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jul 2014 11:07:45 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: m.chehab@samsung.com Cc: hverkuil@xs4all.nl, linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH] em28xx-v4l: fix disabling ioctl VIDIOC_S_PARM for vbi devices Date: Fri, 25 Jul 2014 20:08:30 +0200 Message-Id: <1406311710-5914-1-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.8.4.5 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.7.25.180020 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_1099 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' Fixes an old copy+paste bug that has survived all recent code changes in this code area. Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 087ccf9..90dec29 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -2528,7 +2528,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) v4l2->vbi_dev->queue->lock = &v4l2->vb_vbi_queue_lock; /* disable inapplicable ioctls */ - v4l2_disable_ioctl(v4l2->vdev, VIDIOC_S_PARM); + v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_S_PARM); if (dev->tuner_type == TUNER_ABSENT) { v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_G_TUNER); v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_S_TUNER);