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

Commit 5de39b2b authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver. 



The sn9c102 driver claims to support usb-ID 0x0c45:0x6011, which is
a sn9c102 with ov6650 sensor, but the sn9c102 driver does not support the
ov6650 sensor (tested). Also the sn9c102 driver claims to support usb-ID
0x0c45:0x603f, which is a sn9c102 with CISVF10 sensor, but the sn9c102
driver does not support the CISVF10 sensor (not tested).

Signed-off-by: default avatarHans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 12ff9126

drivers/media/video/gspca/sonixb.c

+2 −0
Original line number Diff line number Diff line
@@ -1426,7 +1426,9 @@ static __devinitdata struct usb_device_id device_table[] = { 
	{USB_DEVICE(0x0c45, 0x6007), DVNM("Sonix sn9c101 + Tas5110D")},

	{USB_DEVICE(0x0c45, 0x6009), DVNM("spcaCam@120")},

	{USB_DEVICE(0x0c45, 0x600d), DVNM("spcaCam@120")},

#endif

	{USB_DEVICE(0x0c45, 0x6011), DVNM("MAX Webcam Microdia")},

#ifndef CONFIG_USB_SN9C102

	{USB_DEVICE(0x0c45, 0x6019), DVNM("Generic Sonix OV7630")},

	{USB_DEVICE(0x0c45, 0x6024), DVNM("Generic Sonix Tas5130c")},

	{USB_DEVICE(0x0c45, 0x6025), DVNM("Xcam Shanga")},

drivers/media/video/sn9c102/sn9c102_devtable.h

+0 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x6005, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6007, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6009, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), },
@@ -57,7 +56,6 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x602e, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x603f, BRIDGE_SN9C102), },

	/* SN9C103 */

	{ SN9C102_USB_DEVICE(0x0c45, 0x6080, BRIDGE_SN9C103), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6082, BRIDGE_SN9C103), },