aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/gspca/m5602/m5602_ov9650.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c
index a9f6ff17ee95..4d3fc78bdf41 100644
--- a/drivers/media/video/gspca/m5602/m5602_ov9650.c
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.c
@@ -154,17 +154,18 @@ int ov9650_start(struct sd *sd)
154 154
155 for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) { 155 for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) {
156 if (res_init_ov9650[i][0] == BRIDGE) 156 if (res_init_ov9650[i][0] == BRIDGE)
157 err = m5602_write_bridge(sd, res_init_ov9650[i][1], res_init_ov9650[i][2]); 157 err = m5602_write_bridge(sd, res_init_ov9650[i][1],
158 res_init_ov9650[i][2]);
158 else if (res_init_ov9650[i][0] == SENSOR) { 159 else if (res_init_ov9650[i][0] == SENSOR) {
159 u8 data = res_init_ov9650[i][2]; 160 u8 data = res_init_ov9650[i][2];
160 err = m5602_write_sensor(sd, res_init_ov9650[i][1], &data, 1); 161 err = m5602_write_sensor(sd,
162 res_init_ov9650[i][1], &data, 1);
161 } 163 }
162 } 164 }
163 if (err < 0) 165 if (err < 0)
164 return err; 166 return err;
165 167
166 switch (cam->cam_mode[sd->gspca_dev.curr_mode].width) 168 switch (cam->cam_mode[sd->gspca_dev.curr_mode].width) {
167 {
168 case 640: 169 case 640:
169 PDEBUG(D_V4L2, "Configuring camera for VGA mode"); 170 PDEBUG(D_V4L2, "Configuring camera for VGA mode");
170 171
@@ -175,7 +176,8 @@ int ov9650_start(struct sd *sd)
175 err = m5602_write_sensor(sd, 176 err = m5602_write_sensor(sd,
176 VGA_ov9650[i][1], &data, 1); 177 VGA_ov9650[i][1], &data, 1);
177 } else { 178 } else {
178 err = m5602_write_bridge(sd, VGA_ov9650[i][1], VGA_ov9650[i][2]); 179 err = m5602_write_bridge(sd, VGA_ov9650[i][1],
180 VGA_ov9650[i][2]);
179 } 181 }
180 } 182 }
181 break; 183 break;
@@ -190,7 +192,8 @@ int ov9650_start(struct sd *sd)
190 err = m5602_write_sensor(sd, 192 err = m5602_write_sensor(sd,
191 CIF_ov9650[i][1], &data, 1); 193 CIF_ov9650[i][1], &data, 1);
192 } else { 194 } else {
193 err = m5602_write_bridge(sd, CIF_ov9650[i][1], CIF_ov9650[i][2]); 195 err = m5602_write_bridge(sd, CIF_ov9650[i][1],
196 CIF_ov9650[i][2]);
194 } 197 }
195 } 198 }
196 break; 199 break;
@@ -205,7 +208,8 @@ int ov9650_start(struct sd *sd)
205 err = m5602_write_sensor(sd, 208 err = m5602_write_sensor(sd,
206 QVGA_ov9650[i][1], &data, 1); 209 QVGA_ov9650[i][1], &data, 1);
207 } else { 210 } else {
208 err = m5602_write_bridge(sd, QVGA_ov9650[i][1], QVGA_ov9650[i][2]); 211 err = m5602_write_bridge(sd, QVGA_ov9650[i][1],
212 QVGA_ov9650[i][2]);
209 } 213 }
210 } 214 }
211 break; 215 break;
@@ -219,7 +223,8 @@ int ov9650_start(struct sd *sd)
219 err = m5602_write_sensor(sd, 223 err = m5602_write_sensor(sd,
220 QCIF_ov9650[i][1], &data, 1); 224 QCIF_ov9650[i][1], &data, 1);
221 } else { 225 } else {
222 err = m5602_write_bridge(sd, QCIF_ov9650[i][1], QCIF_ov9650[i][2]); 226 err = m5602_write_bridge(sd, QCIF_ov9650[i][1],
227 QCIF_ov9650[i][2]);
223 } 228 }
224 } 229 }
225 break; 230 break;