V4L/DVB (9691): gspca: Some cleanups at device register

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 8 insertions, 12 deletions

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 02a6e9ef0337..6e23fd4a203f 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -862,7 +862,7 @@ static int dev_open(struct inode *inode, struct file *file)
         int ret;
 
         PDEBUG(D_STREAM, "%s open", current->comm);
-        gspca_dev = video_drvdata(file);
+        gspca_dev = (struct gspca_dev *) video_devdata(file);
         if (mutex_lock_interruptible(&gspca_dev->queue_lock))
                 return -ERESTARTSYS;
         if (!gspca_dev->present) {
@@ -890,10 +890,10 @@ static int dev_open(struct inode *inode, struct file *file)
 #ifdef GSPCA_DEBUG
         /* activate the v4l2 debug */
         if (gspca_debug & D_V4L2)
-                gspca_dev->vdev->debug |= V4L2_DEBUG_IOCTL
+                gspca_dev->vdev.debug |= V4L2_DEBUG_IOCTL
                                         | V4L2_DEBUG_IOCTL_ARG;
         else
-                gspca_dev->vdev->debug &= ~(V4L2_DEBUG_IOCTL
+                gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL
                                         | V4L2_DEBUG_IOCTL_ARG);
 #endif
         ret = 0;
@@ -1876,13 +1876,11 @@ int gspca_dev_probe(struct usb_interface *intf,
         gspca_dev->vdev->parent = &dev->dev;
         gspca_dev->module = module;
         gspca_dev->present = 1;
-        video_set_drvdata(gspca_dev->vdev, gspca_dev);
-        ret = video_register_device(gspca_dev->vdev,
+        ret = video_register_device(&gspca_dev->vdev,
                                   VFL_TYPE_GRABBER,
                                   video_nr);
         if (ret < 0) {
                 err("video_register_device err %d", ret);
-                video_device_release(gspca_dev->vdev);
                 goto out;
         }
 
@@ -1908,11 +1906,9 @@ void gspca_disconnect(struct usb_interface *intf)
 
         usb_set_intfdata(intf, NULL);
 
-/* We don't want people trying to open up the device */
-        video_unregister_device(gspca_dev->vdev);
-
-        gspca_dev->present = 0;
-        gspca_dev->streaming = 0;
+        /* release the device */
+        /* (this will call gspca_release() immediatly or on last close) */
+        video_unregister_device(&gspca_dev->vdev);
 
         kref_put(&gspca_dev->kref, gspca_delete);
 
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index d25e8d69373b..2ae1ad7c1483 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -120,7 +120,7 @@ struct gspca_frame {
 };
 
 struct gspca_dev {
-        struct video_device *vdev;
+        struct video_device vdev;       /* !! must be the first item */
         struct module *module;          /* subdriver handling the device */
         struct usb_device *dev;
         struct kref kref;