diff --git a/[refs] b/[refs]
index b1fd2e26c123..e178287290ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58a0b84c92e62c2cc42036259a4b51e0bcaf8fa5
+refs/heads/master: f49a5eaea6d7b3ed3d01ca9388eac9e7e5bf6025
diff --git a/trunk/drivers/media/video/bt856.c b/trunk/drivers/media/video/bt856.c
index 909b593530ed..7c68937853b0 100644
--- a/trunk/drivers/media/video/bt856.c
+++ b/trunk/drivers/media/video/bt856.c
@@ -71,17 +71,14 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* ----------------------------------------------------------------------- */
 
-#define REG_OFFSET  0xCE
+#define REG_OFFSET	0xDA
+#define BT856_NR_REG	6
 
 struct bt856 {
-	unsigned char reg[32];
+	unsigned char reg[BT856_NR_REG];
 
 	int norm;
 	int enable;
-	int bright;
-	int contrast;
-	int hue;
-	int sat;
 };
 
 #define   I2C_BT856        0x88
@@ -120,8 +117,8 @@ bt856_dump (struct i2c_client *client)
 	struct bt856 *encoder = i2c_get_clientdata(client);
 
 	printk(KERN_INFO "%s: register dump:", I2C_NAME(client));
-	for (i = 0xd6; i <= 0xde; i += 2)
-		printk(" %02x", encoder->reg[i - REG_OFFSET]);
+	for (i = 0; i < BT856_NR_REG; i += 2)
+		printk(" %02x", encoder->reg[i]);
 	printk("\n");
 }