diff options
-rw-r--r-- | Documentation/video4linux/gspca.txt | 1 | ||||
-rw-r--r-- | drivers/media/video/gspca/mr97310a.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index 90e85a8a8817..2bd1d165042f 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt | |||
@@ -203,6 +203,7 @@ spca500 084d:0003 D-Link DSC-350 | |||
203 | spca500 08ca:0103 Aiptek PocketDV | 203 | spca500 08ca:0103 Aiptek PocketDV |
204 | sunplus 08ca:0104 Aiptek PocketDVII 1.3 | 204 | sunplus 08ca:0104 Aiptek PocketDVII 1.3 |
205 | sunplus 08ca:0106 Aiptek Pocket DV3100+ | 205 | sunplus 08ca:0106 Aiptek Pocket DV3100+ |
206 | mr97310a 08ca:0110 Trust Spyc@m 100 | ||
206 | mr97310a 08ca:0111 Aiptek PenCam VGA+ | 207 | mr97310a 08ca:0111 Aiptek PenCam VGA+ |
207 | sunplus 08ca:2008 Aiptek Mini PenCam 2 M | 208 | sunplus 08ca:2008 Aiptek Mini PenCam 2 M |
208 | sunplus 08ca:2010 Aiptek PocketCam 3M | 209 | sunplus 08ca:2010 Aiptek PocketCam 3M |
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c index 63050f0ebfad..d316b56e396e 100644 --- a/drivers/media/video/gspca/mr97310a.c +++ b/drivers/media/video/gspca/mr97310a.c | |||
@@ -457,7 +457,7 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
457 | if (err_code < 0) | 457 | if (err_code < 0) |
458 | return err_code; | 458 | return err_code; |
459 | 459 | ||
460 | if (id->idProduct == 0x010e) { | 460 | if (id->idProduct == 0x0110 || id->idProduct == 0x010e) { |
461 | sd->cam_type = CAM_TYPE_CIF; | 461 | sd->cam_type = CAM_TYPE_CIF; |
462 | cam->nmodes--; | 462 | cam->nmodes--; |
463 | err_code = cam_get_response16(gspca_dev, 0x06, 1); | 463 | err_code = cam_get_response16(gspca_dev, 0x06, 1); |
@@ -1039,6 +1039,7 @@ static const struct sd_desc sd_desc = { | |||
1039 | 1039 | ||
1040 | /* -- module initialisation -- */ | 1040 | /* -- module initialisation -- */ |
1041 | static const __devinitdata struct usb_device_id device_table[] = { | 1041 | static const __devinitdata struct usb_device_id device_table[] = { |
1042 | {USB_DEVICE(0x08ca, 0x0110)}, /* Trust Spyc@m 100 */ | ||
1042 | {USB_DEVICE(0x08ca, 0x0111)}, /* Aiptek Pencam VGA+ */ | 1043 | {USB_DEVICE(0x08ca, 0x0111)}, /* Aiptek Pencam VGA+ */ |
1043 | {USB_DEVICE(0x093a, 0x010f)}, /* All other known MR97310A VGA cams */ | 1044 | {USB_DEVICE(0x093a, 0x010f)}, /* All other known MR97310A VGA cams */ |
1044 | {USB_DEVICE(0x093a, 0x010e)}, /* All known MR97310A CIF cams */ | 1045 | {USB_DEVICE(0x093a, 0x010e)}, /* All known MR97310A CIF cams */ |