X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fmedia%2Fstv680.c;fp=drivers%2Fusb%2Fmedia%2Fstv680.c;h=b497a6a0a2060eccf5ff81da5ef558728d2f9f84;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=ae455c8e3702866ca1e54c3bc2c3af8e18324245;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
index ae455c8e3..b497a6a0a 100644
--- a/drivers/usb/media/stv680.c
+++ b/drivers/usb/media/stv680.c
@@ -260,7 +260,7 @@ static int stv_stop_video (struct usb_stv *dev)
 			PDEBUG (0, "STV(i): Camera set to original resolution");
 	}
 	/* origMode */
-	kfree (buf);
+	kfree(buf);
 	return i;
 }
 
@@ -276,7 +276,7 @@ static int stv_set_video_mode (struct usb_stv *dev)
 	}
 
 	if ((i = stv_set_config (dev, 1, 0, 0)) < 0) {
-		kfree (buf);
+		kfree(buf);
 		return i;
 	}
 
@@ -301,13 +301,13 @@ static int stv_set_video_mode (struct usb_stv *dev)
 	goto exit;
 
 error:
-	kfree (buf);
+	kfree(buf);
 	if (stop_video == 1)
 		stv_stop_video (dev);
 	return -1;
 
 exit:
-	kfree (buf);
+	kfree(buf);
 	return 0;
 }
 
@@ -327,7 +327,7 @@ static int stv_init (struct usb_stv *stv680)
 
 	/* set config 1, interface 0, alternate 0 */
 	if ((i = stv_set_config (stv680, 1, 0, 0)) < 0) {
-		kfree (buffer);
+		kfree(buffer);
 		PDEBUG (0, "STV(e): set config 1,0,0 failed");
 		return -1;
 	}
@@ -435,11 +435,11 @@ static int stv_init (struct usb_stv *stv680)
 error:
 	i = stv_sndctrl (0, stv680, 0x80, 0, buffer, 0x02);	/* Get Last Error */
 	PDEBUG (1, "STV(i): last error: %i,  command = 0x%x", buffer[0], buffer[1]);
-	kfree (buffer);
+	kfree(buffer);
 	return -1;
 
 exit:
-	kfree (buffer);
+	kfree(buffer);
 
 	/* video = 320x240, 352x288 */
 	if (stv680->CIF == 1) {
@@ -708,10 +708,10 @@ static int stv680_stop_stream (struct usb_stv *stv680)
 			usb_kill_urb (stv680->urb[i]);
 			usb_free_urb (stv680->urb[i]);
 			stv680->urb[i] = NULL;
-			kfree (stv680->sbuf[i].data);
+			kfree(stv680->sbuf[i].data);
 		}
 	for (i = 0; i < STV680_NUMSCRATCH; i++) {
-		kfree (stv680->scratch[i].data);
+		kfree(stv680->scratch[i].data);
 		stv680->scratch[i].data = NULL;
 	}
 
@@ -1068,7 +1068,7 @@ static int stv_close (struct inode *inode, struct file *file)
 	stv680->user = 0;
 
 	if (stv680->removed) {
-		kfree (stv680);
+		kfree(stv680);
 		stv680 = NULL;
 		PDEBUG (0, "STV(i): device unregistered");
 	}
@@ -1343,6 +1343,7 @@ static struct file_operations stv680_fops = {
 	.read =		stv680_read,
 	.mmap =		stv680_mmap,
 	.ioctl =        stv680_ioctl,
+	.compat_ioctl = v4l_compat_ioctl32,
 	.llseek =       no_llseek,
 };
 static struct video_device stv680_template = {
@@ -1375,9 +1376,13 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id
 	    (le16_to_cpu(dev->descriptor.idProduct) == USB_PENCAM_PRODUCT_ID)) {
 		camera_name = "STV0680";
 		PDEBUG (0, "STV(i): STV0680 camera found.");
+	} else if ((le16_to_cpu(dev->descriptor.idVendor) == USB_CREATIVEGOMINI_VENDOR_ID) &&
+		   (le16_to_cpu(dev->descriptor.idProduct) == USB_CREATIVEGOMINI_PRODUCT_ID)) {
+		camera_name = "Creative WebCam Go Mini";
+		PDEBUG (0, "STV(i): Creative WebCam Go Mini found.");
 	} else {
-		PDEBUG (0, "STV(e): Vendor/Product ID do not match STV0680 values.");
-		PDEBUG (0, "STV(e): Check that the STV0680 camera is connected to the computer.");
+		PDEBUG (0, "STV(e): Vendor/Product ID do not match STV0680 or Creative WebCam Go Mini values.");
+		PDEBUG (0, "STV(e): Check that the STV0680 or Creative WebCam Go Mini camera is connected to the computer.");
 		retval = -ENODEV;
 		goto error;
 	}
@@ -1441,14 +1446,14 @@ static inline void usb_stv680_remove_disconnected (struct usb_stv *stv680)
 			usb_kill_urb (stv680->urb[i]);
 			usb_free_urb (stv680->urb[i]);
 			stv680->urb[i] = NULL;
-			kfree (stv680->sbuf[i].data);
+			kfree(stv680->sbuf[i].data);
 		}
 	for (i = 0; i < STV680_NUMSCRATCH; i++)
-		kfree (stv680->scratch[i].data);
+		kfree(stv680->scratch[i].data);
 	PDEBUG (0, "STV(i): %s disconnected", stv680->camera_name);
 
 	/* Free the memory */
-	kfree (stv680);
+	kfree(stv680);
 }
 
 static void stv680_disconnect (struct usb_interface *intf)
@@ -1473,7 +1478,6 @@ static void stv680_disconnect (struct usb_interface *intf)
 }
 
 static struct usb_driver stv680_driver = {
-	.owner =	THIS_MODULE,
 	.name =		"stv680",
 	.probe =	stv680_probe,
 	.disconnect =	stv680_disconnect,