From f8f0f6562050dabd71edbf106d7aa208890fd5ff Mon Sep 17 00:00:00 2001
From: Antonio Ospite <ospite@studenti.unina.it>
Date: Sun, 14 Dec 2008 05:48:07 -0300
Subject: [PATCH] --- yaml --- r: 124396 b: refs/heads/master c:
 e6e483782772994fe42ef9e8b5b4d6f6376b3d45 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/video/gspca/ov534.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 063ec0838083..485a1d16adf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15e3209a30c1b4dd52e937388fb3969d06dc33ec
+refs/heads/master: e6e483782772994fe42ef9e8b5b4d6f6376b3d45
diff --git a/trunk/drivers/media/video/gspca/ov534.c b/trunk/drivers/media/video/gspca/ov534.c
index edcd92557c87..ad97b0be5f39 100644
--- a/trunk/drivers/media/video/gspca/ov534.c
+++ b/trunk/drivers/media/video/gspca/ov534.c
@@ -149,6 +149,20 @@ static void sccb_reg_write(struct usb_device *udev, u16 reg, u8 val)
 		PDEBUG(D_ERR, "sccb_reg_write failed");
 }
 
+static u8 sccb_reg_read(struct usb_device *udev, u16 reg)
+{
+	ov534_reg_write(udev, OV534_REG_SUBADDR, reg);
+	ov534_reg_write(udev, OV534_REG_OPERATION, OV534_OP_WRITE_2);
+	if (!sccb_check_status(udev))
+		PDEBUG(D_ERR, "sccb_reg_read failed 1");
+
+	ov534_reg_write(udev, OV534_REG_OPERATION, OV534_OP_READ_2);
+	if (!sccb_check_status(udev))
+		PDEBUG(D_ERR, "sccb_reg_read failed 2");
+
+	return ov534_reg_read(udev, OV534_REG_READ);
+}
+
 static const __u8 ov534_reg_initdata[][2] = {
 	{ 0xe7, 0x3a },
 
@@ -339,6 +353,9 @@ static void ov534_setup(struct usb_device *udev)
 		ov534_reg_write(udev, ov534_reg_initdata[i][0],
 				ov534_reg_initdata[i][1]);
 
+	PDEBUG(D_PROBE, "sensor is ov%02x%02x",
+		sccb_reg_read(udev, 0x0a), sccb_reg_read(udev, 0x0b));
+
 	ov534_set_led(udev, 1);
 
 	/* Initialize sensor */