5 files changed, 6 insertions, 5 deletions

diff --git a/drivers/media/video/bt8xx/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c
index 62b873076e09..0dfa49b66418 100644
--- a/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/drivers/media/video/bt8xx/bttv-i2c.c
@@ -412,7 +412,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
         unsigned char buf;
         int i,rc;
 
-        for (i = 0; i < 128; i++) {
+        for (i = 0; i < ARRAY_SIZE(i2c_devs); i++) {
                 c->addr = i;
                 rc = i2c_master_recv(c,&buf,0);
                 if (rc < 0)
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 9830d5c43921..7919a1f9da06 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -1,3 +1,4 @@
+
 /*
 
     cx88-i2c.c  --  all the i2c code is here
@@ -195,7 +196,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
         unsigned char buf;
         int i,rc;
 
-        for (i = 0; i < 128; i++) {
+        for (i = 0; i < ARRAY_SIZE(i2c_devs); i++) {
                 c->addr = i;
                 rc = i2c_master_recv(c,&buf,0);
                 if (rc < 0)
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index d829d8f8c1f6..563a8319e608 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -523,7 +523,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
         unsigned char buf;
         int i, rc;
 
-        for (i = 0; i < 128; i++) {
+        for (i = 0; i < ARRAY_SIZE(i2c_devs); i++) {
                 c->addr = i;
                 rc = i2c_master_recv(c, &buf, 0);
                 if (rc < 0)
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 210582d420f8..ed92b6f7187a 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -173,7 +173,7 @@ static int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
                 return -EIO;
         }
 
-        for (start = 0; start<4; start++) {
+        for (start = 0; start < ARRAY_SIZE(b); start++) {
                 if (b[start] == marker) {
                         code=b[(start+parity_offset+1)%4];
                         parity=b[(start+parity_offset)%4];
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 4e8d6c94ea60..1cb8c709ca90 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -447,7 +447,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
         unsigned char buf;
         int i,rc;
 
-        for (i = 0; i < 128; i++) {
+        for (i = 0; i < ARRAY_SIZE(i2c_devs); i++) {
                 c->addr = i;
                 rc = i2c_master_recv(c,&buf,0);
                 if (rc < 0)