1 files changed, 30 insertions, 13 deletions

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 16e367cec760..3a051c925ff6 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -32,6 +32,7 @@
 #include <asm/page.h>
 #include <linux/uaccess.h>
 #include <linux/jiffies.h>
+#include <media/v4l2-ioctl.h>
 
 #include "gspca.h"
 
@@ -42,8 +43,7 @@ MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("GSPCA USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
-static const char version[] = "2.1.7";
+#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 2, 0)
 
 static int video_nr = -1;
 
@@ -209,6 +209,8 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
                                    &frame->v4l2_buf.timestamp);
                 frame->v4l2_buf.sequence = ++gspca_dev->sequence;
         } else if (gspca_dev->last_packet_type == DISCARD_PACKET) {
+                if (packet_type == LAST_PACKET)
+                        gspca_dev->last_packet_type = packet_type;
                 return frame;
         }
 
@@ -399,7 +401,7 @@ static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,
  * This routine may be called many times when the bandwidth is too small
  * (the bandwidth is checked on urb submit).
  */
-struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)
+static struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)
 {
         struct usb_interface *intf;
         struct usb_host_endpoint *ep;
@@ -832,7 +834,16 @@ static int vidioc_querycap(struct file *file, void  *priv,
 
         memset(cap, 0, sizeof *cap);
         strncpy(cap->driver, gspca_dev->sd_desc->name, sizeof cap->driver);
-        strncpy(cap->card, gspca_dev->cam.dev_name, sizeof cap->card);
+/*      strncpy(cap->card, gspca_dev->cam.dev_name, sizeof cap->card); */
+        if (gspca_dev->dev->product != NULL) {
+                strncpy(cap->card, gspca_dev->dev->product,
+                        sizeof cap->card);
+        } else {
+                snprintf(cap->card, sizeof cap->card,
+                        "USB Camera (%04x:%04x)",
+                        le16_to_cpu(gspca_dev->dev->descriptor.idVendor),
+                        le16_to_cpu(gspca_dev->dev->descriptor.idProduct));
+        }
         strncpy(cap->bus_info, gspca_dev->dev->bus->bus_name,
                 sizeof cap->bus_info);
         cap->version = DRIVER_VERSION_NUMBER;
@@ -1649,12 +1660,7 @@ static struct file_operations dev_fops = {
         .poll   = dev_poll,
 };
 
-static struct video_device gspca_template = {
-        .name = "gspca main driver",
-        .type = VID_TYPE_CAPTURE,
-        .fops = &dev_fops,
-        .release = dev_release,         /* mandatory */
-        .minor = -1,
+static const struct v4l2_ioctl_ops dev_ioctl_ops = {
         .vidioc_querycap        = vidioc_querycap,
         .vidioc_dqbuf           = vidioc_dqbuf,
         .vidioc_qbuf            = vidioc_qbuf,
@@ -1683,6 +1689,14 @@ static struct video_device gspca_template = {
 #endif
 };
 
+static struct video_device gspca_template = {
+        .name = "gspca main driver",
+        .fops = &dev_fops,
+        .ioctl_ops = &dev_ioctl_ops,
+        .release = dev_release,         /* mandatory */
+        .minor = -1,
+};
+
 /*
  * probe and create a new gspca device
  *
@@ -1740,10 +1754,11 @@ int gspca_dev_probe(struct usb_interface *intf,
 
         /* init video stuff */
         memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template);
-        gspca_dev->vdev.dev = &dev->dev;
+        gspca_dev->vdev.parent = &dev->dev;
         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);
@@ -1752,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;
@@ -1885,7 +1899,10 @@ EXPORT_SYMBOL(gspca_auto_gain_n_exposure);
 /* -- module insert / remove -- */
 static int __init gspca_init(void)
 {
-        info("main v%s registered", version);
+        info("main v%d.%d.%d registered",
+                (DRIVER_VERSION_NUMBER >> 16) & 0xff,
+                (DRIVER_VERSION_NUMBER >> 8) & 0xff,
+                DRIVER_VERSION_NUMBER & 0xff);
         return 0;
 }
 static void __exit gspca_exit(void)