aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/saa7111.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 8c06592b37ff..a2e1ccb79e49 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -70,8 +70,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
70 70
71/* ----------------------------------------------------------------------- */ 71/* ----------------------------------------------------------------------- */
72 72
73#define SAA7111_NR_REG 0x18
74
73struct saa7111 { 75struct saa7111 {
74 unsigned char reg[32]; 76 unsigned char reg[SAA7111_NR_REG];
75 77
76 int norm; 78 int norm;
77 int input; 79 int input;
@@ -227,11 +229,11 @@ saa7111_command (struct i2c_client *client,
227 { 229 {
228 int i; 230 int i;
229 231
230 for (i = 0; i < 32; i += 16) { 232 for (i = 0; i < SAA7111_NR_REG; i += 16) {
231 int j; 233 int j;
232 234
233 printk(KERN_DEBUG "%s: %03x", I2C_NAME(client), i); 235 printk(KERN_DEBUG "%s: %03x", I2C_NAME(client), i);
234 for (j = 0; j < 16; ++j) { 236 for (j = 0; j < 16 && i + j < SAA7111_NR_REG; ++j) {
235 printk(" %02x", 237 printk(" %02x",
236 saa7111_read(client, i + j)); 238 saa7111_read(client, i + j));
237 } 239 }