1 From: Brandon Philips <bphilips@suse.de>
2 Subject: [PATCH] quickcam_messenger.c: add support for all quickcam
3 Messengers of the same family
5 Patch-Mainline: never, gspca_stv06xx.ko should be used for 2.6.30+
7 Add three devices that are supported by out of tree drivers to the
8 quickcam_messenger driver. Also, remove the sensor_id check since it seems to
11 The quickcam messenger plus (0x08F6) is supported by Christian's out of tree
12 driver[1] but two users have confirmed that the in tree quickcam_messenger
13 driver works for their devices if the IDs are added:
15 https://bugzilla.novell.com/show_bug.cgi?id=441650#c3
16 https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.15/+bug/22070/comments/33
17 https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.15/+bug/22070/comments/34
19 [1] http://home.mag.cx/messenger/source/
21 Information on removal of the driver:
22 http://article.gmane.org/gmane.linux.drivers.video-input-infrastructure/8982/
24 Signed-off-by: Brandon Philips <bphilips@suse.de>
25 Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com>
28 drivers/media/video/usbvideo/quickcam_messenger.c | 13 ++++---------
29 1 file changed, 4 insertions(+), 9 deletions(-)
31 Index: linux-2.6/drivers/media/video/usbvideo/quickcam_messenger.c
32 ===================================================================
33 --- linux-2.6.orig/drivers/media/video/usbvideo/quickcam_messenger.c
34 +++ linux-2.6/drivers/media/video/usbvideo/quickcam_messenger.c
35 @@ -56,9 +56,6 @@ static const int debug;
36 #define DRIVER_VERSION "v0.01"
37 #define DRIVER_DESC "Logitech Quickcam Messenger USB"
39 -#define USB_LOGITECH_VENDOR_ID 0x046D
40 -#define USB_QCM_PRODUCT_ID 0x08F0
44 #define MAX_COLOUR 32768
45 @@ -77,7 +74,10 @@ static int whiteness = MAX_WHITENESS;
46 static struct usbvideo *cams;
48 static struct usb_device_id qcm_table [] = {
49 - { USB_DEVICE(USB_LOGITECH_VENDOR_ID, USB_QCM_PRODUCT_ID) },
50 + { USB_DEVICE(0x046D, 0x08F0) }, /* QuickCam Messenger */
51 + { USB_DEVICE(0x046D, 0x08F5) }, /* QuickCam Communicate */
52 + { USB_DEVICE(0x046D, 0x08F6) }, /* QuickCam Messenger (new) */
53 + { USB_DEVICE(0x046D, 0x08DA) }, /* QuickCam Messenger (new) */
56 MODULE_DEVICE_TABLE(usb, qcm_table);
57 @@ -998,11 +998,6 @@ good_videoep:
58 err("Couldn't read sensor values. Err %d\n",err);
61 - if (sensor_id != cpu_to_le16(0x08F0)) {
62 - err("Sensor ID %x != %x. Unsupported. Sorry\n",
63 - le16_to_cpu(sensor_id), (0x08F0));
67 uvd = usbvideo_AllocateDevice(cams);