diff options
| author | Erik Andr?n <erik.andren@gmail.com> | 2008-12-27 18:06:06 +0100 |
|---|---|---|
| committer | Erik Andr?n <erik.andren@gmail.com> | 2008-12-27 18:06:06 +0100 |
| commit | 45a8275182889ae4860fd2e7b5f8fe07efcf7567 (patch) | |
| tree | c5156d27ba5d9dadec1f0aef2f11e865c41001ba /linux/drivers/media/video/gspca | |
| parent | 6b8e289572105660293c15e0a23daf249aadbf06 (diff) | |
| download | mediapointer-dvb-s2-45a8275182889ae4860fd2e7b5f8fe07efcf7567.tar.gz mediapointer-dvb-s2-45a8275182889ae4860fd2e7b5f8fe07efcf7567.tar.bz2 | |
gspca - m5602-ov9650: Clean up ov9650_start() function.
From: Erik Andr?n <erik.andren@gmail.com>
Cleans some unnecessary temporary variable usage in the ov9650 start function.
Priority: normal
Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Diffstat (limited to 'linux/drivers/media/video/gspca')
| -rw-r--r-- | linux/drivers/media/video/gspca/m5602/m5602_ov9650.c | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_ov9650.c b/linux/drivers/media/video/gspca/m5602/m5602_ov9650.c index 61c5e6b5e..d0668e595 100644 --- a/linux/drivers/media/video/gspca/m5602/m5602_ov9650.c +++ b/linux/drivers/media/video/gspca/m5602/m5602_ov9650.c @@ -149,10 +149,8 @@ int ov9650_start(struct sd *sd) int i, err = 0; struct cam *cam = &sd->gspca_dev.cam; - for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) { - u8 data = res_init_ov9650[i][1]; - err = m5602_write_bridge(sd, res_init_ov9650[i][0], data); - } + for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) + err = m5602_write_bridge(sd, res_init_ov9650[i][0], res_init_ov9650[i][1]); if (err < 0) return err; @@ -162,12 +160,14 @@ int ov9650_start(struct sd *sd) PDEBUG(D_V4L2, "Configuring camera for VGA mode"); for (i = 0; i < ARRAY_SIZE(VGA_ov9650) && !err; i++) { - u8 data = VGA_ov9650[i][2]; - if (VGA_ov9650[i][0] == SENSOR) + if (VGA_ov9650[i][0] == SENSOR) { + u8 data = VGA_ov9650[i][2]; + err = m5602_write_sensor(sd, VGA_ov9650[i][1], &data, 1); - else - err = m5602_write_bridge(sd, VGA_ov9650[i][1], data); + } else { + err = m5602_write_bridge(sd, VGA_ov9650[i][1], VGA_ov9650[i][2]); + } } break; @@ -175,12 +175,14 @@ int ov9650_start(struct sd *sd) PDEBUG(D_V4L2, "Configuring camera for CIF mode"); for (i = 0; i < ARRAY_SIZE(CIF_ov9650) && !err; i++) { - u8 data = CIF_ov9650[i][2]; - if (CIF_ov9650[i][0] == SENSOR) + if (CIF_ov9650[i][0] == SENSOR) { + u8 data = CIF_ov9650[i][2]; + err = m5602_write_sensor(sd, CIF_ov9650[i][1], &data, 1); - else - err = m5602_write_bridge(sd, CIF_ov9650[i][1], data); + } else { + err = m5602_write_bridge(sd, CIF_ov9650[i][1], CIF_ov9650[i][2]); + } } break; @@ -188,12 +190,14 @@ int ov9650_start(struct sd *sd) PDEBUG(D_V4L2, "Configuring camera for QVGA mode"); for (i = 0; i < ARRAY_SIZE(QVGA_ov9650) && !err; i++) { - u8 data = QVGA_ov9650[i][2]; - if (QVGA_ov9650[i][0] == SENSOR) + if (QVGA_ov9650[i][0] == SENSOR) { + u8 data = QVGA_ov9650[i][2]; + err = m5602_write_sensor(sd, QVGA_ov9650[i][1], &data, 1); - else - err = m5602_write_bridge(sd, QVGA_ov9650[i][1], data); + } else { + err = m5602_write_bridge(sd, QVGA_ov9650[i][1], QVGA_ov9650[i][2]); + } } break; @@ -201,12 +205,13 @@ int ov9650_start(struct sd *sd) PDEBUG(D_V4L2, "Configuring camera for QCIF mode"); for (i = 0; i < ARRAY_SIZE(QCIF_ov9650) && !err; i++) { - u8 data = QCIF_ov9650[i][2]; - if (QCIF_ov9650[i][0] == SENSOR) + if (QCIF_ov9650[i][0] == SENSOR) { + u8 data = QCIF_ov9650[i][2]; err = m5602_write_sensor(sd, QCIF_ov9650[i][1], &data, 1); - else - err = m5602_write_bridge(sd, QCIF_ov9650[i][1], data); + } else { + err = m5602_write_bridge(sd, QCIF_ov9650[i][1], QCIF_ov9650[i][2]); + } } break; |