]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (8544): gspca: probe/open race.
authorOliver Neukum <oneukum@suse.de>
Sun, 27 Jul 2008 17:01:59 +0000 (14:01 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 27 Jul 2008 21:07:57 +0000 (18:07 -0300)
The device is flagged present after it is registered. During that window calls
to open() that should work fail with -ENODEV. Reversing the order fixes
the race.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Acked-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/gspca/gspca.c

index bc301bae0482c1f98bb822c688eb733a9b44042e..3a051c925ff6eda699f4b05378a473b7e34a05f9 100644 (file)
@@ -1758,6 +1758,7 @@ int gspca_dev_probe(struct usb_interface *intf,
        memcpy(&gspca_dev->fops, &dev_fops, sizeof gspca_dev->fops);
        gspca_dev->vdev.fops = &gspca_dev->fops;
        gspca_dev->fops.owner = module;         /* module protection */
+       gspca_dev->present = 1;
        ret = video_register_device(&gspca_dev->vdev,
                                  VFL_TYPE_GRABBER,
                                  video_nr);
@@ -1766,7 +1767,6 @@ int gspca_dev_probe(struct usb_interface *intf,
                goto out;
        }
 
-       gspca_dev->present = 1;
        usb_set_intfdata(intf, gspca_dev);
        PDEBUG(D_PROBE, "probe ok");
        return 0;