The patch number 13243 was added via h...@rhel5-devel.localdomain
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Aurelien Jacobs <au...@gnuage.org>
gscpa_mr97310a: Add Trust s...@m 100 USB ID
gscpa_mr97310a: Add Trust s...@m 100 USB ID
Priority: normal
Signed-off-by: Aurelien Jacobs <au...@gnuage.org>
Signed-off-by: Hans de Goede <hdego...@redhat.com>
---
linux/Documentation/video4linux/gspca.txt | 1 +
linux/drivers/media/video/gspca/mr97310a.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff -r 17185719db08 -r 5dbdfc20a931 linux/Documentation/video4linux/gspca.txt
--- a/linux/Documentation/video4linux/gspca.txt Thu Oct 29 11:42:30 2009 +0100
+++ b/linux/Documentation/video4linux/gspca.txt Thu Oct 29 11:45:24 2009 +0100
@@ -202,6 +202,7 @@
spca500 08ca:0103 Aiptek PocketDV
sunplus 08ca:0104 Aiptek PocketDVII 1.3
sunplus 08ca:0106 Aiptek Pocket DV3100+
+mr97310a 08ca:0110 Trust s...@m 100
mr97310a 08ca:0111 Aiptek PenCam VGA+
sunplus 08ca:2008 Aiptek Mini PenCam 2 M
sunplus 08ca:2010 Aiptek PocketCam 3M
diff -r 17185719db08 -r 5dbdfc20a931 linux/drivers/media/video/gspca/mr97310a.c
--- a/linux/drivers/media/video/gspca/mr97310a.c Thu Oct 29 11:42:30
2009 +0100
+++ b/linux/drivers/media/video/gspca/mr97310a.c Thu Oct 29 11:45:24
2009 +0100
@@ -457,7 +457,7 @@
if (err_code < 0)
return err_code;
- if (id->idProduct == 0x010e) {
+ if (id->idProduct == 0x0110 || id->idProduct == 0x010e) {
sd->cam_type = CAM_TYPE_CIF;
cam->nmodes--;
err_code = cam_get_response16(gspca_dev, 0x06, 1);
@@ -1039,6 +1039,7 @@
/* -- module initialisation -- */
static const __devinitdata struct usb_device_id device_table[] = {
+ {USB_DEVICE(0x08ca, 0x0110)}, /* Trust s...@m 100 */
{USB_DEVICE(0x08ca, 0x0111)}, /* Aiptek Pencam VGA+ */
{USB_DEVICE(0x093a, 0x010f)}, /* All other known MR97310A VGA cams */
{USB_DEVICE(0x093a, 0x010e)}, /* All known MR97310A CIF cams */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/5dbdfc20a93177711119545d6c2ccdc39b3c30ab
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
