diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-27 01:56:33 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 10:06:47 -0400 |
commit | c52e4f5836cff0a70a25665f475cf5294c9fe5eb (patch) | |
tree | 7684c9251abe28590ef60d737ac89a9276837cc8 /drivers/media | |
parent | 87581aa5f10959224fc7e1a30ac9af53949d0ef2 (diff) |
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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | 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 3db49a854fe2..e18748c5a14d 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[] = { | |||
1194 | SFCI(OV6650, F_GAIN|F_AUTO|F_SIF, 5, 0x60)}, | 1194 | SFCI(OV6650, F_GAIN|F_AUTO|F_SIF, 5, 0x60)}, |
1195 | #ifndef CONFIG_USB_SN9C102 | 1195 | #ifndef CONFIG_USB_SN9C102 |
1196 | {USB_DEVICE(0x0c45, 0x6019), /* SN9C101 */ | 1196 | {USB_DEVICE(0x0c45, 0x6019), /* SN9C101 */ |
1197 | SFCI(OV7630, F_GAIN|F_AUTO|F_SIF, 5, 0x21)}, | 1197 | SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)}, |
1198 | {USB_DEVICE(0x0c45, 0x6024), /* SN9C102 */ | 1198 | {USB_DEVICE(0x0c45, 0x6024), /* SN9C102 */ |
1199 | SFCI(TAS5130CXX, 0, 2, 0)}, | 1199 | SFCI(TAS5130CXX, 0, 2, 0)}, |
1200 | {USB_DEVICE(0x0c45, 0x6025), /* SN9C102 */ | 1200 | {USB_DEVICE(0x0c45, 0x6025), /* SN9C102 */ |
@@ -1204,15 +1204,15 @@ static __devinitdata struct usb_device_id device_table[] = { | |||
1204 | {USB_DEVICE(0x0c45, 0x6029), /* SN9C101 */ | 1204 | {USB_DEVICE(0x0c45, 0x6029), /* SN9C101 */ |
1205 | SFCI(PAS106, F_SIF, 2, 0)}, | 1205 | SFCI(PAS106, F_SIF, 2, 0)}, |
1206 | {USB_DEVICE(0x0c45, 0x602c), /* SN9C102 */ | 1206 | {USB_DEVICE(0x0c45, 0x602c), /* SN9C102 */ |
1207 | SFCI(OV7630, F_GAIN|F_AUTO|F_SIF, 5, 0x21)}, | 1207 | SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)}, |
1208 | {USB_DEVICE(0x0c45, 0x602d), /* SN9C102 */ | 1208 | {USB_DEVICE(0x0c45, 0x602d), /* SN9C102 */ |
1209 | SFCI(HV7131R, 0, 2, 0)}, | 1209 | SFCI(HV7131R, 0, 2, 0)}, |
1210 | {USB_DEVICE(0x0c45, 0x602e), /* SN9C102 */ | 1210 | {USB_DEVICE(0x0c45, 0x602e), /* SN9C102 */ |
1211 | SFCI(OV7630, F_GAIN|F_AUTO|F_SIF, 5, 0x21)}, | 1211 | SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)}, |
1212 | {USB_DEVICE(0x0c45, 0x60af), /* SN9C103 */ | 1212 | {USB_DEVICE(0x0c45, 0x60af), /* SN9C103 */ |
1213 | SFCI(PAS202, F_H18, 2, 0)}, | 1213 | SFCI(PAS202, F_H18, 2, 0)}, |
1214 | {USB_DEVICE(0x0c45, 0x60b0), /* SN9C103 */ | 1214 | {USB_DEVICE(0x0c45, 0x60b0), /* SN9C103 */ |
1215 | SFCI(OV7630, F_GAIN|F_AUTO|F_SIF|F_H18, 5, 0x21)}, | 1215 | SFCI(OV7630, F_GAIN|F_AUTO|F_H18, 5, 0x21)}, |
1216 | #endif | 1216 | #endif |
1217 | {} | 1217 | {} |
1218 | }; | 1218 | }; |