Merge branch 'master' into upstream

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d95529e8e513..cd1502ac9560 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -605,6 +605,8 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         tvee->tuner_formats |= hauppauge_tuner_fmt[i].id;
                         t_fmt_name1[j++] = hauppauge_tuner_fmt[i].name;
                 }
+        }
+        for (i = j = 0; i < 8; i++) {
                 if (t_format2 & (1 << i)) {
                         tvee->tuner2_formats |= hauppauge_tuner_fmt[i].id;
                         t_fmt_name2[j++] = hauppauge_tuner_fmt[i].name;