tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (9092): gspca: Bad init values for sonixj ov7660.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by Jean-Francois Moine and committed by Mauro Carvalho Chehab 674cbc69 8d768e14

+13 -5
unified split
+13 -5
drivers/media/video/gspca/sonixj.c
··· 977 case BRIDGE_SN9C105: 978 if (regF1 != 0x11) 979 return -ENODEV; 980 - reg_w(gspca_dev, 0x02, regGpio, 2); 981 break; 982 case BRIDGE_SN9C120: 983 if (regF1 != 0x12) 984 return -ENODEV; 985 regGpio[1] = 0x70; 986 - reg_w(gspca_dev, 0x02, regGpio, 2); 987 break; 988 default: 989 /* case BRIDGE_SN9C110: */ ··· 1184 static const __u8 CA[] = { 0x28, 0xd8, 0x14, 0xec }; 1185 static const __u8 CE[] = { 0x32, 0xdd, 0x2d, 0xdd }; /* MI0360 */ 1186 static const __u8 CE_ov76xx[] = 1187 - { 0x32, 0xdd, 0x32, 0xdd }; /* OV7630/48 */ 1188 1189 sn9c1xx = sn_tb[(int) sd->sensor]; 1190 configure_gpio(gspca_dev, sn9c1xx); ··· 1224 reg_w(gspca_dev, 0x20, gamma_def, sizeof gamma_def); 1225 for (i = 0; i < 8; i++) 1226 reg_w(gspca_dev, 0x84, reg84, sizeof reg84); 1227 reg_w1(gspca_dev, 0x9a, 0x08); 1228 reg_w1(gspca_dev, 0x99, 0x59); 1229 1230 mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv; 1231 if (mode) ··· 1283 /* reg1 = 0x44; */ 1284 /* reg1 = 0x46; (done) */ 1285 } else { 1286 - reg17 = 0x22; /* 640 MCKSIZE */ 1287 - reg1 = 0x06; 1288 } 1289 break; 1290 } ··· 1293 switch (sd->sensor) { 1294 case SENSOR_OV7630: 1295 case SENSOR_OV7648: 1296 reg_w(gspca_dev, 0xce, CE_ov76xx, 4); 1297 break; 1298 default:
··· 977 case BRIDGE_SN9C105: 978 if (regF1 != 0x11) 979 return -ENODEV; 980 + reg_w(gspca_dev, 0x01, regGpio, 2); 981 break; 982 case BRIDGE_SN9C120: 983 if (regF1 != 0x12) 984 return -ENODEV; 985 regGpio[1] = 0x70; 986 + reg_w(gspca_dev, 0x01, regGpio, 2); 987 break; 988 default: 989 /* case BRIDGE_SN9C110: */ ··· 1184 static const __u8 CA[] = { 0x28, 0xd8, 0x14, 0xec }; 1185 static const __u8 CE[] = { 0x32, 0xdd, 0x2d, 0xdd }; /* MI0360 */ 1186 static const __u8 CE_ov76xx[] = 1187 + { 0x32, 0xdd, 0x32, 0xdd }; 1188 1189 sn9c1xx = sn_tb[(int) sd->sensor]; 1190 configure_gpio(gspca_dev, sn9c1xx); ··· 1224 reg_w(gspca_dev, 0x20, gamma_def, sizeof gamma_def); 1225 for (i = 0; i < 8; i++) 1226 reg_w(gspca_dev, 0x84, reg84, sizeof reg84); 1227 + switch (sd->sensor) { 1228 + case SENSOR_OV7660: 1229 + reg_w1(gspca_dev, 0x9a, 0x05); 1230 + break; 1231 + default: 1232 reg_w1(gspca_dev, 0x9a, 0x08); 1233 reg_w1(gspca_dev, 0x99, 0x59); 1234 + break; 1235 + } 1236 1237 mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv; 1238 if (mode) ··· 1276 /* reg1 = 0x44; */ 1277 /* reg1 = 0x46; (done) */ 1278 } else { 1279 + reg17 = 0xa2; /* 640 */ 1280 + reg1 = 0x44; 1281 } 1282 break; 1283 } ··· 1286 switch (sd->sensor) { 1287 case SENSOR_OV7630: 1288 case SENSOR_OV7648: 1289 + case SENSOR_OV7660: 1290 reg_w(gspca_dev, 0xce, CE_ov76xx, 4); 1291 break; 1292 default: