diff --git a/[refs] b/[refs]
index 05ec80f808ea..7f103107af41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f8de1a10697efe7bee08e51b587208706b44e97
+refs/heads/master: 2467a670ee24631b05e91971286730e71f6a6af0
diff --git a/trunk/drivers/media/video/adv7175.c b/trunk/drivers/media/video/adv7175.c
index 4e218f22b214..245f94265758 100644
--- a/trunk/drivers/media/video/adv7175.c
+++ b/trunk/drivers/media/video/adv7175.c
@@ -68,8 +68,6 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 /* ----------------------------------------------------------------------- */
 
 struct adv7175 {
-	unsigned char reg[128];
-
 	int norm;
 	int input;
 	int enable;
@@ -95,9 +93,6 @@ adv7175_write (struct i2c_client *client,
 	       u8                 reg,
 	       u8                 value)
 {
-	struct adv7175 *encoder = i2c_get_clientdata(client);
-
-	encoder->reg[reg] = value;
 	return i2c_smbus_write_byte_data(client, reg, value);
 }
 
@@ -120,7 +115,6 @@ adv7175_write_block (struct i2c_client *client,
 	 * the adapter understands raw I2C */
 	if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
 		/* do raw I2C, not smbus compatible */
-		struct adv7175 *encoder = i2c_get_clientdata(client);
 		struct i2c_msg msg;
 		u8 block_data[32];
 
@@ -131,8 +125,8 @@ adv7175_write_block (struct i2c_client *client,
 			msg.len = 0;
 			block_data[msg.len++] = reg = data[0];
 			do {
-				block_data[msg.len++] =
-				    encoder->reg[reg++] = data[1];
+				block_data[msg.len++] = data[1];
+				reg++;
 				len -= 2;
 				data += 2;
 			} while (len >= 2 && data[0] == reg &&