Commit dbad345e authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: sn9c102 / zc0301: Handle webcams when no gspca subdriver conflict 



Some webcams handled by both sn9c102 or zc0301 and some gspca subdrivers
(sonixb, sonixj and zc3xx) were not handled when gspca was generated but
not the associated subdrivers.

Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent be1da9ee

drivers/media/video/sn9c102/sn9c102_devtable.h

+9 −9
Original line number Diff line number Diff line
@@ -40,12 +40,12 @@ struct sn9c102_device; 


static const struct usb_device_id sn9c102_id_table[] = {

	/* SN9C101 and SN9C102 */

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE

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

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

#endif

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

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE

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

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

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), }, OV6650 */
@@ -53,13 +53,13 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), },

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

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

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE

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

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

#endif

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

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

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE

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

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), }, HV7131R */

#endif
@@ -74,7 +74,7 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x608b, BRIDGE_SN9C103), },

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

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x608e, BRIDGE_SN9C103), }, CISVF10 */

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE

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

#endif

	{ SN9C102_USB_DEVICE(0x0c45, 0x60a0, BRIDGE_SN9C103), },
@@ -86,7 +86,7 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x60ac, BRIDGE_SN9C103), },

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

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

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE

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

#endif

	{ SN9C102_USB_DEVICE(0x0c45, 0x60b2, BRIDGE_SN9C103), },
@@ -97,7 +97,7 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x60bc, BRIDGE_SN9C103), },

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

	/* SN9C105 */

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE

	{ SN9C102_USB_DEVICE(0x045e, 0x00f5, BRIDGE_SN9C105), },

	{ SN9C102_USB_DEVICE(0x045e, 0x00f7, BRIDGE_SN9C105), },

	{ SN9C102_USB_DEVICE(0x0471, 0x0327, BRIDGE_SN9C105), },
@@ -121,11 +121,11 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6130, BRIDGE_SN9C120), },

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), }, MO8000 */

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE

	{ SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), },

#endif

	{ SN9C102_USB_DEVICE(0x0c45, 0x613b, BRIDGE_SN9C120), },

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE

	{ SN9C102_USB_DEVICE(0x0c45, 0x613c, BRIDGE_SN9C120), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x613e, BRIDGE_SN9C120), },

#endif

drivers/media/video/zc0301/zc0301_sensor.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor); 
	.idProduct = (prod),                                                  \

	.bInterfaceClass = (intclass)



#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

#if !defined CONFIG_USB_GSPCA_ZC3XX && !defined CONFIG_USB_GSPCA_ZC3XX_MODULE

#define ZC0301_ID_TABLE                                                       \

static const struct usb_device_id zc0301_id_table[] =  {                      \

	{ ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */            \