aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/media
diff options
context:
space:
mode:
authorKiril Jovchev <jovchev@gmail.com>2005-06-04 18:52:33 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-27 17:44:01 -0400
commit16367877949a91b11bcc6f37b94d0033388b4256 (patch)
tree50d437e35d505cd357af9c99713870cbb13b133d /drivers/usb/media
parent2c45b6feb394337b4b468229632b8737375caf1d (diff)
[PATCH] USB: add support for Creative WebCam mini to stv680 driver
Added support for Creative WebCam Go Mini. Camera has STV680 chip and just different Product ID(0x4007) and Vendor ID (0x041e). Signed-off-by: Kiril Jovchev <jovchev@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/media')
-rw-r--r--drivers/usb/media/stv680.c8
-rw-r--r--drivers/usb/media/stv680.h5
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
index ae455c8e3702..7398a7f19c1e 100644
--- a/drivers/usb/media/stv680.c
+++ b/drivers/usb/media/stv680.c
@@ -1375,9 +1375,13 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id
1375 (le16_to_cpu(dev->descriptor.idProduct) == USB_PENCAM_PRODUCT_ID)) { 1375 (le16_to_cpu(dev->descriptor.idProduct) == USB_PENCAM_PRODUCT_ID)) {
1376 camera_name = "STV0680"; 1376 camera_name = "STV0680";
1377 PDEBUG (0, "STV(i): STV0680 camera found."); 1377 PDEBUG (0, "STV(i): STV0680 camera found.");
1378 } else if ((le16_to_cpu(dev->descriptor.idVendor) == USB_CREATIVEGOMINI_VENDOR_ID) &&
1379 (le16_to_cpu(dev->descriptor.idProduct) == USB_CREATIVEGOMINI_PRODUCT_ID)) {
1380 camera_name = "Creative WebCam Go Mini";
1381 PDEBUG (0, "STV(i): Creative WebCam Go Mini found.");
1378 } else { 1382 } else {
1379 PDEBUG (0, "STV(e): Vendor/Product ID do not match STV0680 values."); 1383 PDEBUG (0, "STV(e): Vendor/Product ID do not match STV0680 or Creative WebCam Go Mini values.");
1380 PDEBUG (0, "STV(e): Check that the STV0680 camera is connected to the computer."); 1384 PDEBUG (0, "STV(e): Check that the STV0680 or Creative WebCam Go Mini camera is connected to the computer.");
1381 retval = -ENODEV; 1385 retval = -ENODEV;
1382 goto error; 1386 goto error;
1383 } 1387 }
diff --git a/drivers/usb/media/stv680.h b/drivers/usb/media/stv680.h
index 7e0e314dcf12..445940612603 100644
--- a/drivers/usb/media/stv680.h
+++ b/drivers/usb/media/stv680.h
@@ -41,12 +41,17 @@
41 41
42#define USB_PENCAM_VENDOR_ID 0x0553 42#define USB_PENCAM_VENDOR_ID 0x0553
43#define USB_PENCAM_PRODUCT_ID 0x0202 43#define USB_PENCAM_PRODUCT_ID 0x0202
44
45#define USB_CREATIVEGOMINI_VENDOR_ID 0x041e
46#define USB_CREATIVEGOMINI_PRODUCT_ID 0x4007
47
44#define PENCAM_TIMEOUT 1000 48#define PENCAM_TIMEOUT 1000
45/* fmt 4 */ 49/* fmt 4 */
46#define STV_VIDEO_PALETTE VIDEO_PALETTE_RGB24 50#define STV_VIDEO_PALETTE VIDEO_PALETTE_RGB24
47 51
48static struct usb_device_id device_table[] = { 52static struct usb_device_id device_table[] = {
49 {USB_DEVICE (USB_PENCAM_VENDOR_ID, USB_PENCAM_PRODUCT_ID)}, 53 {USB_DEVICE (USB_PENCAM_VENDOR_ID, USB_PENCAM_PRODUCT_ID)},
54 {USB_DEVICE (USB_CREATIVEGOMINI_VENDOR_ID, USB_CREATIVEGOMINI_PRODUCT_ID)},
50 {} 55 {}
51}; 56};
52MODULE_DEVICE_TABLE (usb, device_table); 57MODULE_DEVICE_TABLE (usb, device_table);