diff options
Diffstat (limited to 'linux/drivers/media/video/ov7670.c')
| -rw-r--r-- | linux/drivers/media/video/ov7670.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/linux/drivers/media/video/ov7670.c b/linux/drivers/media/video/ov7670.c index f7f340858..26397cdb3 100644 --- a/linux/drivers/media/video/ov7670.c +++ b/linux/drivers/media/video/ov7670.c @@ -196,7 +196,7 @@ static struct regval_list ov7670_default_regs[] = { { 0x70, 0x3a }, { 0x71, 0x35 }, { 0x72, 0x11 }, { 0x73, 0xf0 }, { 0xa2, 0x02 }, { REG_COM10, 0x0 }, - + /* Gamma curve values */ { 0x7a, 0x20 }, { 0x7b, 0x10 }, { 0x7c, 0x1e }, { 0x7d, 0x35 }, @@ -221,7 +221,7 @@ static struct regval_list ov7670_default_regs[] = { { REG_HAECC5, 0xf0 }, { REG_HAECC6, 0x90 }, { REG_HAECC7, 0x94 }, { REG_COM8, COM8_FASTAEC|COM8_AECSTEP|COM8_BFILT|COM8_AGC|COM8_AEC }, - + /* Almost all of these are magic "reserved" values. */ { REG_COM5, 0x61 }, { REG_COM6, 0x4b }, { 0x16, 0x02 }, { REG_MVFP, 0x07|MVFP_MIRROR }, @@ -257,7 +257,7 @@ static struct regval_list ov7670_default_regs[] = { { 0x51, 0 }, { 0x52, 0x22 }, { 0x53, 0x5e }, { 0x54, 0x80 }, { 0x58, 0x9e }, - + { REG_COM16, COM16_AWBGAIN }, { REG_EDGE, 0 }, { 0x75, 0x05 }, { 0x76, 0xe1 }, { 0x4c, 0 }, { 0x77, 0x01 }, @@ -605,7 +605,7 @@ static int ov7670_set_hw(struct i2c_client *client, int hstart, int hstop, static int ov7670_enum_fmt(struct i2c_client *c, struct v4l2_fmtdesc *fmt) { struct ov7670_format_struct *ofmt; - + if (fmt->index >= N_OV7670_FMTS) return -EINVAL; @@ -644,7 +644,7 @@ static int ov7670_try_fmt(struct i2c_client *c, struct v4l2_format *fmt, * we support, but not below the smallest. */ for (wsize = ov7670_win_sizes; wsize < ov7670_win_sizes + N_WIN_SIZES; - wsize++) + wsize++) if (pix->width >= wsize->width && pix->height >= wsize->height) break; if (wsize > ov7670_win_sizes + N_WIN_SIZES) @@ -723,7 +723,7 @@ static int ov7670_t_brightness(struct i2c_client *client, unsigned char value) { unsigned char com8; int ret; - + ov7670_read(client, REG_COM8, &com8); com8 &= ~COM8_AEC; ov7670_write(client, REG_COM8, com8); @@ -847,7 +847,7 @@ static struct ov7670_control { .minimum = 0, .maximum = 1, .step = 1, - .default_value = 0, + .default_value = 0, }, .tweak = ov7670_t_vflip, .query = ov7670_q_vflip, @@ -860,7 +860,7 @@ static struct ov7670_control { .minimum = 0, .maximum = 1, .step = 1, - .default_value = 0, + .default_value = 0, }, .tweak = ov7670_t_hflip, .query = ov7670_q_hflip, @@ -895,7 +895,7 @@ static int ov7670_g_ctrl(struct i2c_client *client, struct v4l2_control *ctrl) struct ov7670_control *octrl = ov7670_find_control(ctrl->id); int ret; unsigned char v; - + if (octrl == NULL) return -EINVAL; ret = octrl->query(client, &v); @@ -909,7 +909,7 @@ static int ov7670_g_ctrl(struct i2c_client *client, struct v4l2_control *ctrl) static int ov7670_s_ctrl(struct i2c_client *client, struct v4l2_control *ctrl) { struct ov7670_control *octrl = ov7670_find_control(ctrl->id); - + if (octrl == NULL) return -EINVAL; return octrl->tweak(client, ctrl->value); @@ -930,7 +930,7 @@ static int ov7670_attach(struct i2c_adapter *adapter) { int ret; struct i2c_client *client; - + printk(KERN_ERR "ov7670 attach, id = %d\n", adapter->id); /* * For now: only deal with adapters we recognize. @@ -990,11 +990,11 @@ static int ov7670_command(struct i2c_client *client, unsigned int cmd, case VIDIOC_ENUM_FMT: return ov7670_enum_fmt(client, (struct v4l2_fmtdesc *) arg); case VIDIOC_TRY_FMT: - return ov7670_try_fmt(client, (struct v4l2_format *) arg, NULL, NULL); + return ov7670_try_fmt(client, (struct v4l2_format *) arg, NULL, NULL); case VIDIOC_S_FMT: return ov7670_s_fmt(client, (struct v4l2_format *) arg); case VIDIOC_QUERYCTRL: - return ov7670_queryctrl(client, (struct v4l2_queryctrl *) arg); + return ov7670_queryctrl(client, (struct v4l2_queryctrl *) arg); case VIDIOC_S_CTRL: return ov7670_s_ctrl(client, (struct v4l2_control *) arg); case VIDIOC_G_CTRL: |