Skip to content

Commit

Permalink
V4L/DVB (10006): gspca - m5602: Align some defines
Browse files Browse the repository at this point in the history
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Erik Andrén authored and Mauro Carvalho Chehab committed Dec 30, 2008
1 parent 3250070 commit bac79f3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions drivers/media/video/gspca/m5602/m5602_s5k83a.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ int s5k83a_probe(struct sd *sd)
}

int s5k83a_read_sensor(struct sd *sd, const u8 address,
u8 *i2c_data, const u8 len)
u8 *i2c_data, const u8 len)
{
int err, i;

Expand Down Expand Up @@ -106,11 +106,11 @@ int s5k83a_read_sensor(struct sd *sd, const u8 address,
}

out:
return (err < 0) ? err : 0;
return err;
}

int s5k83a_write_sensor(struct sd *sd, const u8 address,
u8 *i2c_data, const u8 len)
u8 *i2c_data, const u8 len)
{
int err, i;
u8 *p;
Expand Down
14 changes: 7 additions & 7 deletions drivers/media/video/gspca/m5602/m5602_s5k83a.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
#include "m5602_sensor.h"

#define S5K83A_FLIP 0x01
#define S5K83A_HFLIP_TUNE 0x03
#define S5K83A_VFLIP_TUNE 0x05
#define S5K83A_WHITENESS 0x0a
#define S5K83A_HFLIP_TUNE 0x03
#define S5K83A_VFLIP_TUNE 0x05
#define S5K83A_WHITENESS 0x0a
#define S5K83A_GAIN 0x18
#define S5K83A_BRIGHTNESS 0x1b
#define S5K83A_PAGE_MAP 0xec
#define S5K83A_BRIGHTNESS 0x1b
#define S5K83A_PAGE_MAP 0xec

#define S5K83A_DEFAULT_BRIGHTNESS 0x71
#define S5K83A_DEFAULT_WHITENESS 0x7e
#define S5K83A_DEFAULT_BRIGHTNESS 0x71
#define S5K83A_DEFAULT_WHITENESS 0x7e
#define S5K83A_DEFAULT_GAIN 0x00
#define S5K83A_MAXIMUM_GAIN 0x3c
#define S5K83A_FLIP_MASK 0x10
Expand Down

0 comments on commit bac79f3

Please sign in to comment.