Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87581aa5 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8520): gspca: Bad webcam information in some modules since 28b8203a830e. 



Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 5da162e7

drivers/media/video/gspca/spca500.c

+15 −15
Original line number Diff line number Diff line
@@ -1061,21 +1061,21 @@ static struct sd_desc sd_desc = { 


/* -- module initialisation -- */

static const __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x040a, 0x0300), KodakEZ200},

	{USB_DEVICE(0x041e, 0x400a), CreativePCCam300},

	{USB_DEVICE(0x046d, 0x0890), LogitechTraveler},

	{USB_DEVICE(0x046d, 0x0900), LogitechClickSmart310},

	{USB_DEVICE(0x046d, 0x0901), LogitechClickSmart510},

	{USB_DEVICE(0x04a5, 0x300c), BenqDC1016},

	{USB_DEVICE(0x04fc, 0x7333), PalmPixDC85},

	{USB_DEVICE(0x055f, 0xc200), MustekGsmart300},

	{USB_DEVICE(0x055f, 0xc220), Gsmartmini},

	{USB_DEVICE(0x06bd, 0x0404), AgfaCl20},

	{USB_DEVICE(0x06be, 0x0800), Optimedia},

	{USB_DEVICE(0x084d, 0x0003), DLinkDSC350},

	{USB_DEVICE(0x08ca, 0x0103), AiptekPocketDV},

	{USB_DEVICE(0x2899, 0x012c), ToptroIndus},

	{USB_DEVICE(0x8086, 0x0630), IntelPocketPCCamera},

	{USB_DEVICE(0x040a, 0x0300), .driver_info = KodakEZ200},

	{USB_DEVICE(0x041e, 0x400a), .driver_info = CreativePCCam300},

	{USB_DEVICE(0x046d, 0x0890), .driver_info = LogitechTraveler},

	{USB_DEVICE(0x046d, 0x0900), .driver_info = LogitechClickSmart310},

	{USB_DEVICE(0x046d, 0x0901), .driver_info = LogitechClickSmart510},

	{USB_DEVICE(0x04a5, 0x300c), .driver_info = BenqDC1016},

	{USB_DEVICE(0x04fc, 0x7333), .driver_info = PalmPixDC85},

	{USB_DEVICE(0x055f, 0xc200), .driver_info = MustekGsmart300},

	{USB_DEVICE(0x055f, 0xc220), .driver_info = Gsmartmini},

	{USB_DEVICE(0x06bd, 0x0404), .driver_info = AgfaCl20},

	{USB_DEVICE(0x06be, 0x0800), .driver_info = Optimedia},

	{USB_DEVICE(0x084d, 0x0003), .driver_info = DLinkDSC350},

	{USB_DEVICE(0x08ca, 0x0103), .driver_info = AiptekPocketDV},

	{USB_DEVICE(0x2899, 0x012c), .driver_info = ToptroIndus},

	{USB_DEVICE(0x8086, 0x0630), .driver_info = IntelPocketPCCamera},

	{}

};

MODULE_DEVICE_TABLE(usb, device_table);

drivers/media/video/gspca/spca501.c

+7 −7
Original line number Diff line number Diff line
@@ -2130,13 +2130,13 @@ static const struct sd_desc sd_desc = { 


/* -- module initialisation -- */

static const __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x040a, 0x0002), KodakDVC325},

	{USB_DEVICE(0x0497, 0xc001), SmileIntlCamera},

	{USB_DEVICE(0x0506, 0x00df), ThreeComHomeConnectLite},

	{USB_DEVICE(0x0733, 0x0401), IntelCreateAndShare},

	{USB_DEVICE(0x0733, 0x0402), ViewQuestM318B},

	{USB_DEVICE(0x1776, 0x501c), Arowana300KCMOSCamera},

	{USB_DEVICE(0x0000, 0x0000), MystFromOriUnknownCamera},

	{USB_DEVICE(0x040a, 0x0002), .driver_info = KodakDVC325},

	{USB_DEVICE(0x0497, 0xc001), .driver_info = SmileIntlCamera},

	{USB_DEVICE(0x0506, 0x00df), .driver_info = ThreeComHomeConnectLite},

	{USB_DEVICE(0x0733, 0x0401), .driver_info = IntelCreateAndShare},

	{USB_DEVICE(0x0733, 0x0402), .driver_info = ViewQuestM318B},

	{USB_DEVICE(0x1776, 0x501c), .driver_info = Arowana300KCMOSCamera},

	{USB_DEVICE(0x0000, 0x0000), .driver_info = MystFromOriUnknownCamera},

	{}

};

MODULE_DEVICE_TABLE(usb, device_table);

drivers/media/video/gspca/spca505.c

+2 −2
Original line number Diff line number Diff line
@@ -835,8 +835,8 @@ static const struct sd_desc sd_desc = { 


/* -- module initialisation -- */

static const __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x041e, 0x401d), Nxultra},

	{USB_DEVICE(0x0733, 0x0430), IntelPCCameraPro},

	{USB_DEVICE(0x041e, 0x401d), .driver_info = Nxultra},

	{USB_DEVICE(0x0733, 0x0430), .driver_info = IntelPCCameraPro},

/*fixme: may be UsbGrabberPV321 BRIDGE_SPCA506 SENSOR_SAA7113 */

	{}

};

drivers/media/video/gspca/spca508.c

+7 −7
Original line number Diff line number Diff line
@@ -1643,13 +1643,13 @@ static const struct sd_desc sd_desc = { 


/* -- module initialisation -- */

static const __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x0130, 0x0130), HamaUSBSightcam},

	{USB_DEVICE(0x041e, 0x4018), CreativeVista},

	{USB_DEVICE(0x0461, 0x0815), MicroInnovationIC200},

	{USB_DEVICE(0x0733, 0x0110), ViewQuestVQ110},

	{USB_DEVICE(0x0af9, 0x0010), HamaUSBSightcam},

	{USB_DEVICE(0x0af9, 0x0011), HamaUSBSightcam2},

	{USB_DEVICE(0x8086, 0x0110), IntelEasyPCCamera},

	{USB_DEVICE(0x0130, 0x0130), .driver_info = HamaUSBSightcam},

	{USB_DEVICE(0x041e, 0x4018), .driver_info = CreativeVista},

	{USB_DEVICE(0x0461, 0x0815), .driver_info = MicroInnovationIC200},

	{USB_DEVICE(0x0733, 0x0110), .driver_info = ViewQuestVQ110},

	{USB_DEVICE(0x0af9, 0x0010), .driver_info = HamaUSBSightcam},

	{USB_DEVICE(0x0af9, 0x0011), .driver_info = HamaUSBSightcam2},

	{USB_DEVICE(0x8086, 0x0110), .driver_info = IntelEasyPCCamera},

	{}

};

MODULE_DEVICE_TABLE(usb, device_table);

drivers/media/video/gspca/spca561.c

+15 −15
Original line number Diff line number Diff line
@@ -975,21 +975,21 @@ static const struct sd_desc sd_desc = { 


/* -- module initialisation -- */

static const __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x041e, 0x401a), Rev072A},

	{USB_DEVICE(0x041e, 0x403b), Rev012A},

	{USB_DEVICE(0x0458, 0x7004), Rev072A},

	{USB_DEVICE(0x046d, 0x0928), Rev012A},

	{USB_DEVICE(0x046d, 0x0929), Rev012A},

	{USB_DEVICE(0x046d, 0x092a), Rev012A},

	{USB_DEVICE(0x046d, 0x092b), Rev012A},

	{USB_DEVICE(0x046d, 0x092c), Rev012A},

	{USB_DEVICE(0x046d, 0x092d), Rev012A},

	{USB_DEVICE(0x046d, 0x092e), Rev012A},

	{USB_DEVICE(0x046d, 0x092f), Rev012A},

	{USB_DEVICE(0x04fc, 0x0561), Rev072A},

	{USB_DEVICE(0x060b, 0xa001), Rev072A},

	{USB_DEVICE(0x10fd, 0x7e50), Rev072A},

	{USB_DEVICE(0xabcd, 0xcdee), Rev072A},

	{USB_DEVICE(0x041e, 0x401a), .driver_info = Rev072A},

	{USB_DEVICE(0x041e, 0x403b), .driver_info = Rev012A},

	{USB_DEVICE(0x0458, 0x7004), .driver_info = Rev072A},

	{USB_DEVICE(0x046d, 0x0928), .driver_info = Rev012A},

	{USB_DEVICE(0x046d, 0x0929), .driver_info = Rev012A},

	{USB_DEVICE(0x046d, 0x092a), .driver_info = Rev012A},

	{USB_DEVICE(0x046d, 0x092b), .driver_info = Rev012A},

	{USB_DEVICE(0x046d, 0x092c), .driver_info = Rev012A},

	{USB_DEVICE(0x046d, 0x092d), .driver_info = Rev012A},

	{USB_DEVICE(0x046d, 0x092e), .driver_info = Rev012A},

	{USB_DEVICE(0x046d, 0x092f), .driver_info = Rev012A},

	{USB_DEVICE(0x04fc, 0x0561), .driver_info = Rev072A},

	{USB_DEVICE(0x060b, 0xa001), .driver_info = Rev072A},

	{USB_DEVICE(0x10fd, 0x7e50), .driver_info = Rev072A},

	{USB_DEVICE(0xabcd, 0xcdee), .driver_info = Rev072A},

	{}

};