From 2699864600f01105e9fcae48dc4ab5e701c98c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Andr=C3=A9n?= <erik.andren@gmail.com>
Date: Wed, 26 Nov 2008 13:15:35 -0300
Subject: [PATCH] --- yaml --- r: 124493 b: refs/heads/master c:
 e7a7f5103bddf2491760677cdd715a865b889072 h: refs/heads/master i:   124491:
 762d0d289d6a8387b450b19c706de3f5abab174f v: v3

---
 [refs]                                        |  2 +-
 .../media/video/gspca/m5602/m5602_bridge.h    |  3 ++
 .../media/video/gspca/m5602/m5602_core.c      | 36 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b489a0e1bc4e..bbffb8902d43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fce65f6515f049dea9451afaa0e85af01aecd190
+refs/heads/master: e7a7f5103bddf2491760677cdd715a865b889072
diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_bridge.h b/trunk/drivers/media/video/gspca/m5602/m5602_bridge.h
index 51376e2a902d..a3f3b7a0c7e7 100644
--- a/trunk/drivers/media/video/gspca/m5602/m5602_bridge.h
+++ b/trunk/drivers/media/video/gspca/m5602/m5602_bridge.h
@@ -136,4 +136,7 @@ int m5602_write_bridge(
 int m5602_write_sensor(struct sd *sd, const u8 address,
 		       u8 *i2c_data, const u8 len);
 
+int m5602_read_sensor(struct sd *sd, const u8 address,
+		      u8 *i2c_data, const u8 len);
+
 #endif
diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_core.c b/trunk/drivers/media/video/gspca/m5602/m5602_core.c
index d69e3c4ff97d..aaba42058181 100644
--- a/trunk/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/trunk/drivers/media/video/gspca/m5602/m5602_core.c
@@ -80,6 +80,42 @@ int m5602_write_bridge(struct sd *sd, u8 address, u8 i2c_data)
 	return (err < 0) ? err : 0;
 }
 
+int m5602_read_sensor(struct sd *sd, const u8 address,
+		       u8 *i2c_data, const u8 len)
+{
+	int err, i;
+
+	do {
+		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+	} while ((*i2c_data & I2C_BUSY) && !err);
+
+	err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+				 sd->sensor->i2c_slave_id);
+	if (err < 0)
+		goto out;
+
+	err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+	if (err < 0)
+		goto out;
+
+	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);
+	if (err < 0)
+		goto out;
+
+	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
+	if (err < 0)
+		goto out;
+
+	for (i = 0; (i < len) && !err; i++) {
+		err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+		PDEBUG(D_CONF, "Reading sensor register "
+			       "0x%x containing 0x%x ", address, *i2c_data);
+	}
+out:
+	return err;
+}
+
 int m5602_write_sensor(struct sd *sd, const u8 address,
 			u8 *i2c_data, const u8 len)
 {