From d224c725f33c8075a7f50efb531dc52d9c2f9ef5 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Wed, 22 Mar 2006 03:48:32 -0300
Subject: [PATCH] --- yaml --- r: 23266 b: refs/heads/master c:
 6eb5d9ca9f1496108cb86f2d9bfc2db5d9c796fe h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/media/video/saa7111.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 038904f50d6d..1c6c98c7c355 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6254312352dfd1c996245cb3bc74be901dc165cc
+refs/heads/master: 6eb5d9ca9f1496108cb86f2d9bfc2db5d9c796fe
diff --git a/trunk/drivers/media/video/saa7111.c b/trunk/drivers/media/video/saa7111.c
index 8c06592b37ff..a2e1ccb79e49 100644
--- a/trunk/drivers/media/video/saa7111.c
+++ b/trunk/drivers/media/video/saa7111.c
@@ -70,8 +70,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* ----------------------------------------------------------------------- */
 
+#define SAA7111_NR_REG		0x18
+
 struct saa7111 {
-	unsigned char reg[32];
+	unsigned char reg[SAA7111_NR_REG];
 
 	int norm;
 	int input;
@@ -227,11 +229,11 @@ saa7111_command (struct i2c_client *client,
 	{
 		int i;
 
-		for (i = 0; i < 32; i += 16) {
+		for (i = 0; i < SAA7111_NR_REG; i += 16) {
 			int j;
 
 			printk(KERN_DEBUG "%s: %03x", I2C_NAME(client), i);
-			for (j = 0; j < 16; ++j) {
+			for (j = 0; j < 16 && i + j < SAA7111_NR_REG; ++j) {
 				printk(" %02x",
 				       saa7111_read(client, i + j));
 			}