From a3d302a833b66344319a7c5121dfc57c4f0e59c8 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Wed, 25 Mar 2009 07:04:11 -0300
Subject: [PATCH] --- yaml --- r: 138318 b: refs/heads/master c:
 33f5b07e30b1daf98416f2e621a6201f6fff9041 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/video/gspca/vc032x.c | 24 +++++-------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 0beff5a596aa..780ea88c9515 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db786a3fde5fca025dc2ea96232e010baf335961
+refs/heads/master: 33f5b07e30b1daf98416f2e621a6201f6fff9041
diff --git a/trunk/drivers/media/video/gspca/vc032x.c b/trunk/drivers/media/video/gspca/vc032x.c
index cdd17bcf42c7..8aab2fb95ac6 100644
--- a/trunk/drivers/media/video/gspca/vc032x.c
+++ b/trunk/drivers/media/video/gspca/vc032x.c
@@ -2400,33 +2400,19 @@ static int vc032x_probe_sensor(struct gspca_dev *gspca_dev)
 }
 
 static void i2c_write(struct gspca_dev *gspca_dev,
-			__u8 reg, const __u8 *val, __u8 size)
+			u8 reg, const u8 *val,
+			u8 size)		/* 1 or 2 */
 {
 	struct usb_device *dev = gspca_dev->dev;
 	int retry;
 
-#ifdef GSPCA_DEBUG
-	if (size > 3 || size < 1)
-		return;
-#endif
 	reg_r(gspca_dev, 0xa1, 0xb33f, 1);
+/*fixme:should check if (!(gspca_dev->usb_buf[0] & 0x02)) error*/
 	reg_w(dev, 0xa0, size, 0xb334);
 	reg_w(dev, 0xa0, reg, 0xb33a);
-	switch (size) {
-	case 1:
-		reg_w(dev, 0xa0, val[0], 0xb336);
-		break;
-	case 2:
-		reg_w(dev, 0xa0, val[0], 0xb336);
-		reg_w(dev, 0xa0, val[1], 0xb337);
-		break;
-	default:
-/*	case 3: */
-		reg_w(dev, 0xa0, val[0], 0xb336);
+	reg_w(dev, 0xa0, val[0], 0xb336);
+	if (size > 1)
 		reg_w(dev, 0xa0, val[1], 0xb337);
-		reg_w(dev, 0xa0, val[2], 0xb338);
-		break;
-	}
 	reg_w(dev, 0xa0, 0x01, 0xb339);
 	retry = 4;
 	do {