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

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

V4L/DVB (8668): gspca: Conflict GSPCA / ET61X251 for the webcam 102c:6251. 



Fix a double handling of 102c:6251 and no handling of 102c:6151
when both drivers GSPCA and ET61X251.

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

drivers/media/video/gspca/etoms.c

+2 −2
Original line number Diff line number Diff line
@@ -904,10 +904,10 @@ static struct sd_desc sd_desc = { 


/* -- module initialisation -- */

static __devinitdata struct usb_device_id device_table[] = {

#ifndef CONFIG_USB_ET61X251

	{USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},

#endif

#ifndef CONFIG_USB_ET61X251

	{USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},

#endif

	{}

};