From: Jean-Francois Moine <moinejf@free.fr>
Date: Wed, 3 Sep 2008 19:47:29 +0000 (-0300)
Subject: V4L/DVB (8668): gspca: Conflict GSPCA / ET61X251 for the webcam 102c:6251.
X-Git-Tag: v2.6.27-rc6~37^2~4^2~78
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bb0f21a46281b021897d2c56d50685c1939b5ee;p=linux-2.6

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: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 1dbe92d01e..ca23c3f9aa 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -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
 	{}
 };