1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index 2064dc008af1..8cee6748d38f 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -23,8 +23,8 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 5)
-static const char version[] = "2.1.5";
+#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 7)
+static const char version[] = "2.1.7";
 
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SPCA501 USB Camera Driver");
@@ -1826,28 +1826,27 @@ static int reg_write(struct usb_device *dev,
 }
 
 /* returns: negative is error, pos or zero is data */
-static int reg_read(struct usb_device *dev,
+static int reg_read(struct gspca_dev *gspca_dev,
                         __u16 req,      /* bRequest */
                         __u16 index,    /* wIndex */
                         __u16 length)   /* wLength (1 or 2 only) */
 {
         int ret;
-        __u8 buf[2];
 
-        buf[1] = 0;
-        ret = usb_control_msg(dev,
-                        usb_rcvctrlpipe(dev, 0),
+        gspca_dev->usb_buf[1] = 0;
+        ret = usb_control_msg(gspca_dev->dev,
+                        usb_rcvctrlpipe(gspca_dev->dev, 0),
                         req,
                         USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                         0,              /* value */
                         index,
-                        buf, length,
+                        gspca_dev->usb_buf, length,
                         500);                   /* timeout */
         if (ret < 0) {
                 PDEBUG(D_ERR, "reg_read err %d", ret);
                 return -1;
         }
-        return (buf[1] << 8) + buf[0];
+        return (gspca_dev->usb_buf[1] << 8) + gspca_dev->usb_buf[0];
 }
 
 static int write_vector(struct gspca_dev *gspca_dev,
@@ -1883,7 +1882,7 @@ static void getbrightness(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
         __u16 brightness;
 
-        brightness = reg_read(gspca_dev->dev, SPCA501_REG_CCDSP, 0x11, 2);
+        brightness = reg_read(gspca_dev, SPCA501_REG_CCDSP, 0x11, 2);
         sd->brightness = brightness << 1;
 }
 
@@ -1913,8 +1912,8 @@ static void getcolors(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        sd->colors = reg_read(gspca_dev->dev, SPCA501_REG_CCDSP, 0x0c, 2);
-/*      sd->hue = (reg_read(gspca_dev->dev, SPCA501_REG_CCDSP, 0x13, */
+        sd->colors = reg_read(gspca_dev, SPCA501_REG_CCDSP, 0x0c, 2);
+/*      sd->hue = (reg_read(gspca_dev, SPCA501_REG_CCDSP, 0x13, */
 /*                      2) & 0xFF) << 8; */
 }