diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_s5k83a.c | 6 | ||||
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_s5k83a.h | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c index 8988a728e0b4..0f2addd9802b 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k83a.c +++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.c | |||
@@ -69,7 +69,7 @@ sensor_found: | |||
69 | } | 69 | } |
70 | 70 | ||
71 | int s5k83a_read_sensor(struct sd *sd, const u8 address, | 71 | int s5k83a_read_sensor(struct sd *sd, const u8 address, |
72 | u8 *i2c_data, const u8 len) | 72 | u8 *i2c_data, const u8 len) |
73 | { | 73 | { |
74 | int err, i; | 74 | int err, i; |
75 | 75 | ||
@@ -106,11 +106,11 @@ int s5k83a_read_sensor(struct sd *sd, const u8 address, | |||
106 | } | 106 | } |
107 | 107 | ||
108 | out: | 108 | out: |
109 | return (err < 0) ? err : 0; | 109 | return err; |
110 | } | 110 | } |
111 | 111 | ||
112 | int s5k83a_write_sensor(struct sd *sd, const u8 address, | 112 | int s5k83a_write_sensor(struct sd *sd, const u8 address, |
113 | u8 *i2c_data, const u8 len) | 113 | u8 *i2c_data, const u8 len) |
114 | { | 114 | { |
115 | int err, i; | 115 | int err, i; |
116 | u8 *p; | 116 | u8 *p; |
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h index ee3ee9cfca1d..acc89d08f2ab 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k83a.h +++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h | |||
@@ -22,15 +22,15 @@ | |||
22 | #include "m5602_sensor.h" | 22 | #include "m5602_sensor.h" |
23 | 23 | ||
24 | #define S5K83A_FLIP 0x01 | 24 | #define S5K83A_FLIP 0x01 |
25 | #define S5K83A_HFLIP_TUNE 0x03 | 25 | #define S5K83A_HFLIP_TUNE 0x03 |
26 | #define S5K83A_VFLIP_TUNE 0x05 | 26 | #define S5K83A_VFLIP_TUNE 0x05 |
27 | #define S5K83A_WHITENESS 0x0a | 27 | #define S5K83A_WHITENESS 0x0a |
28 | #define S5K83A_GAIN 0x18 | 28 | #define S5K83A_GAIN 0x18 |
29 | #define S5K83A_BRIGHTNESS 0x1b | 29 | #define S5K83A_BRIGHTNESS 0x1b |
30 | #define S5K83A_PAGE_MAP 0xec | 30 | #define S5K83A_PAGE_MAP 0xec |
31 | 31 | ||
32 | #define S5K83A_DEFAULT_BRIGHTNESS 0x71 | 32 | #define S5K83A_DEFAULT_BRIGHTNESS 0x71 |
33 | #define S5K83A_DEFAULT_WHITENESS 0x7e | 33 | #define S5K83A_DEFAULT_WHITENESS 0x7e |
34 | #define S5K83A_DEFAULT_GAIN 0x00 | 34 | #define S5K83A_DEFAULT_GAIN 0x00 |
35 | #define S5K83A_MAXIMUM_GAIN 0x3c | 35 | #define S5K83A_MAXIMUM_GAIN 0x3c |
36 | #define S5K83A_FLIP_MASK 0x10 | 36 | #define S5K83A_FLIP_MASK 0x10 |