From patchwork Thu Oct 14 20:06:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valdis.Kletnieks@vt.edu X-Patchwork-Id: 4610 Return-path: Envelope-to: mchehab@pedra Delivery-date: Thu, 14 Oct 2010 17:08:51 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1P6U6c-0004m6-SY for mchehab@pedra; Thu, 14 Oct 2010 17:08:51 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Thu, 14 Oct 2010 17:08:50 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1P6U5P-0003DP-Bh; Thu, 14 Oct 2010 20:07:35 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756008Ab0JNUGx (ORCPT + 1 other); Thu, 14 Oct 2010 16:06:53 -0400 Received: from lennier.cc.vt.edu ([198.82.162.213]:59937 "EHLO lennier.cc.vt.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756004Ab0JNUGw (ORCPT ); Thu, 14 Oct 2010 16:06:52 -0400 Received: from vivi.cc.vt.edu (vivi.cc.vt.edu [198.82.163.43]) by lennier.cc.vt.edu (8.13.8/8.13.8) with ESMTP id o9EK4beg028030; Thu, 14 Oct 2010 16:06:30 -0400 Received: from turing-police.cc.vt.edu (EHLO localhost) ([128.173.14.107]) by vivi.cc.vt.edu (MOS 4.1.8-GA FastPath queued) with ESMTP id NDI21940; Thu, 14 Oct 2010 16:06:30 -0400 (EDT) X-Mailer: exmh version 2.7.2 01/07/2005 with nmh-1.2 To: Andrew Morton , Hans Verkuil , Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken In-Reply-To: Your message of "Wed, 13 Oct 2010 17:13:25 PDT." <201010140044.o9E0iuR3029069@imap1.linux-foundation.org> From: Valdis.Kletnieks@vt.edu References: <201010140044.o9E0iuR3029069@imap1.linux-foundation.org> Mime-Version: 1.0 Date: Thu, 14 Oct 2010 16:06:29 -0400 Message-ID: <5158.1287086789@localhost> X-Mirapoint-Received-SPF: 128.173.14.107 localhost Valdis.Kletnieks@vt.edu 2 pass X-Mirapoint-IP-Reputation: reputation=neutral-1, source=Fixed, refid=n/a, actions=MAILHURDLE SPF TAG X-Junkmail-Status: score=10/50, host=vivi.cc.vt.edu X-Junkmail-SD-Raw: score=unknown, refid=str=0001.0A020202.4CB762C6.012B,ss=1,fgs=0, ip=0.0.0.0, so=2009-09-22 00:05:22, dmn=2009-09-10 00:05:08, mode=single engine X-Junkmail-IWF: false Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: On Wed, 13 Oct 2010 17:13:25 PDT, akpm@linux-foundation.org said: > The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to > > http://userweb.kernel.org/~akpm/mmotm/ This broke my webcam. I bisected it down to this commit, and things work again after reverting the 2 code lines of change. commit 9e4d79a98ebd857ec729f5fa8f432f35def4d0da Author: Hans Verkuil Date: Sun Sep 26 08:16:56 2010 -0300 V4L/DVB: v4l2-dev: after a disconnect any ioctl call will be blocked Until now all fops except release and (unlocked_)ioctl returned an error after the device node was unregistered. Extend this as well to the ioctl fops. There is nothing useful that an application can do here and it complicates the driver code unnecessarily. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab I suspect this doesn't do what's intended if a driver is using ->unlocked_ioctl rather than ->ioctl, and it should be reverted - it only saves at most one if statement. diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index d4a3532..f069c61 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c @@ -221,8 +221,8 @@ static long v4l2_ioctl(struct file *filp, unsigned int cmd, struct video_device *vdev = video_devdata(filp); int ret; - /* Allow ioctl to continue even if the device was unregistered. - Things like dequeueing buffers might still be useful. */ + if (!vdev->fops->ioctl) + return -ENOTTY; if (vdev->fops->unlocked_ioctl) { ret = vdev->fops->unlocked_ioctl(filp, cmd, arg); } else if (vdev->fops->ioctl) {