---

yaml --- r: 124484 b: refs/heads/master c: bac79f3 h: refs/heads/master v: v3
git-mirror · Dec 30, 2008 · 2e29972 · 2e29972
1 parent 9794efa
commit 2e29972
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32500701e572f07e4d9c8e10c6c26d09c28f48a4
+refs/heads/master: bac79f37be2944f7a1db7585b347ca57628d57e2
diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/trunk/drivers/media/video/gspca/m5602/m5602_s5k83a.c
@@ -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;
 
@@ -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;

diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/trunk/drivers/media/video/gspca/m5602/m5602_s5k83a.h
@@ -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