diff options
Diffstat (limited to 'drivers/media/video/pwc/pwc-if.c')
-rw-r--r-- | drivers/media/video/pwc/pwc-if.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 27ed76986ca2..085332a503de 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
@@ -95,8 +95,8 @@ static const struct usb_device_id pwc_device_table [] = { | |||
95 | { USB_DEVICE(0x046D, 0x08B3) }, /* Logitech QuickCam Zoom (old model) */ | 95 | { USB_DEVICE(0x046D, 0x08B3) }, /* Logitech QuickCam Zoom (old model) */ |
96 | { USB_DEVICE(0x046D, 0x08B4) }, /* Logitech QuickCam Zoom (new model) */ | 96 | { USB_DEVICE(0x046D, 0x08B4) }, /* Logitech QuickCam Zoom (new model) */ |
97 | { USB_DEVICE(0x046D, 0x08B5) }, /* Logitech QuickCam Orbit/Sphere */ | 97 | { USB_DEVICE(0x046D, 0x08B5) }, /* Logitech QuickCam Orbit/Sphere */ |
98 | { USB_DEVICE(0x046D, 0x08B6) }, /* Logitech (reserved) */ | 98 | { USB_DEVICE(0x046D, 0x08B6) }, /* Cisco VT Camera */ |
99 | { USB_DEVICE(0x046D, 0x08B7) }, /* Logitech (reserved) */ | 99 | { USB_DEVICE(0x046D, 0x08B7) }, /* Logitech ViewPort AV 100 */ |
100 | { USB_DEVICE(0x046D, 0x08B8) }, /* Logitech (reserved) */ | 100 | { USB_DEVICE(0x046D, 0x08B8) }, /* Logitech (reserved) */ |
101 | { USB_DEVICE(0x055D, 0x9000) }, /* Samsung MPC-C10 */ | 101 | { USB_DEVICE(0x055D, 0x9000) }, /* Samsung MPC-C10 */ |
102 | { USB_DEVICE(0x055D, 0x9001) }, /* Samsung MPC-C30 */ | 102 | { USB_DEVICE(0x055D, 0x9001) }, /* Samsung MPC-C30 */ |
@@ -1493,7 +1493,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id | |||
1493 | case 0x0329: | 1493 | case 0x0329: |
1494 | PWC_INFO("Philips SPC 900NC USB webcam detected.\n"); | 1494 | PWC_INFO("Philips SPC 900NC USB webcam detected.\n"); |
1495 | name = "Philips SPC 900NC webcam"; | 1495 | name = "Philips SPC 900NC webcam"; |
1496 | type_id = 720; | 1496 | type_id = 740; |
1497 | break; | 1497 | break; |
1498 | default: | 1498 | default: |
1499 | return -ENODEV; | 1499 | return -ENODEV; |
@@ -1547,8 +1547,16 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id | |||
1547 | features |= FEATURE_MOTOR_PANTILT; | 1547 | features |= FEATURE_MOTOR_PANTILT; |
1548 | break; | 1548 | break; |
1549 | case 0x08b6: | 1549 | case 0x08b6: |
1550 | PWC_INFO("Logitech/Cisco VT Camera webcam detected.\n"); | ||
1551 | name = "Cisco VT Camera"; | ||
1552 | type_id = 740; /* CCD sensor */ | ||
1553 | break; | ||
1550 | case 0x08b7: | 1554 | case 0x08b7: |
1551 | case 0x08b8: | 1555 | PWC_INFO("Logitech ViewPort AV 100 webcam detected.\n"); |
1556 | name = "Logitech ViewPort AV 100"; | ||
1557 | type_id = 740; /* CCD sensor */ | ||
1558 | break; | ||
1559 | case 0x08b8: /* Where this released? */ | ||
1552 | PWC_INFO("Logitech QuickCam detected (reserved ID).\n"); | 1560 | PWC_INFO("Logitech QuickCam detected (reserved ID).\n"); |
1553 | name = "Logitech QuickCam (res.)"; | 1561 | name = "Logitech QuickCam (res.)"; |
1554 | type_id = 730; /* Assuming CMOS */ | 1562 | type_id = 730; /* Assuming CMOS */ |