Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c52e4f...
Commit: c52e4f5836cff0a70a25665f475cf5294c9fe5eb
Parent: 87581aa5f10959224fc7e1a30ac9af53949d0ef2
Author: Jean-Francois Moine <moinejf@free.fr>
AuthorDate: Sun Jul 27 02:56:33 2008 -0300
Committer: Mauro Carvalho Chehab <mchehab@infradead.org>
CommitDate: Sun Jul 27 11:06:47 2008 -0300
V4L/DVB (8521): gspca: Webcams with Sonix bridge and sensor ov7630 are VGA.
This fixes a bug introduced in c503a6f8332a (thanks to Hans de Goede).
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/gspca/sonixb.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 3db49a8..e18748c 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -1194,7 +1194,7 @@ static __devinitdata struct usb_device_id device_table[] = {
SFCI(OV6650, F_GAIN|F_AUTO|F_SIF, 5, 0x60)},
#ifndef CONFIG_USB_SN9C102
{USB_DEVICE(0x0c45, 0x6019), /* SN9C101 */
- SFCI(OV7630, F_GAIN|F_AUTO|F_SIF, 5, 0x21)},
+ SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
{USB_DEVICE(0x0c45, 0x6024), /* SN9C102 */
SFCI(TAS5130CXX, 0, 2, 0)},
{USB_DEVICE(0x0c45, 0x6025), /* SN9C102 */
@@ -1204,15 +1204,15 @@ static __devinitdata struct usb_device_id device_table[] = {
{USB_DEVICE(0x0c45, 0x6029), /* SN9C101 */
SFCI(PAS106, F_SIF, 2, 0)},
{USB_DEVICE(0x0c45, 0x602c), /* SN9C102 */
- SFCI(OV7630, F_GAIN|F_AUTO|F_SIF, 5, 0x21)},
+ SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
{USB_DEVICE(0x0c45, 0x602d), /* SN9C102 */
SFCI(HV7131R, 0, 2, 0)},
{USB_DEVICE(0x0c45, 0x602e), /* SN9C102 */
- SFCI(OV7630, F_GAIN|F_AUTO|F_SIF, 5, 0x21)},
+ SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
{USB_DEVICE(0x0c45, ...