mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken

[Valdis.Kletnieks@vt.edu]

[-- Attachment #1: Type: text/plain, Size: 1774 bytes --]

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 <hverkuil@xs4all.nl>
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 <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>


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) {

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.


[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]