From 2e299725e6148d1afc5c69f3b8199cc828bbe311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Andr=C3=A9n?= <erik.andren@gmail.com>
Date: Thu, 20 Nov 2008 14:03:22 -0300
Subject: [PATCH] --- yaml --- r: 124484 b: refs/heads/master c:
 bac79f37be2944f7a1db7585b347ca57628d57e2 h: refs/heads/master v: v3

---
 [refs]                                             |  2 +-
 .../drivers/media/video/gspca/m5602/m5602_s5k83a.c |  6 +++---
 .../drivers/media/video/gspca/m5602/m5602_s5k83a.h | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index dd032aa086ca..98fe1a3c52f2 100644
--- 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
index 8988a728e0b4..0f2addd9802b 100644
--- 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
index ee3ee9cfca1d..acc89d08f2ab 100644
--- 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