--- linux/drivers/media/video/bttv-cards.c	2004-08-14 13:55:32.000000000 +0300
+++ mylinux/drivers/media/video/bttv-cards.c	2004-09-07 13:43:55.000000000 +0300
@@ -2751,6 +2751,7 @@ static void modtec_eeprom(struct bttv *b
 static void __devinit hauppauge_eeprom(struct bttv *btv)
 {
 	unsigned int blk2,tuner,radio,model;
+	char *tuner_name;
 
 	if (eeprom_data[0] != 0x84 || eeprom_data[2] != 0)
 		printk(KERN_WARNING "bttv%d: Hauppauge eeprom: invalid\n",
@@ -2764,15 +2765,18 @@ static void __devinit hauppauge_eeprom(s
 	tuner = eeprom_data[9];
 	radio = eeprom_data[blk2-1] & 0x01;
 	
-        if (tuner < ARRAY_SIZE(hauppauge_tuner))
+	tuner_name = "?";
+        if (tuner < ARRAY_SIZE(hauppauge_tuner)) {
                 btv->tuner_type = hauppauge_tuner[tuner].id;
+		tuner_name = hauppauge_tuner[tuner].name;
+	}
 	if (radio)
 		btv->has_radio = 1;
 	
 	if (bttv_verbose)
 		printk(KERN_INFO "bttv%d: Hauppauge eeprom: model=%d, "
 		       "tuner=%s (%d), radio=%s\n",
-		       btv->c.nr, model, hauppauge_tuner[tuner].name,
+		       btv->c.nr, model, tuner_name,
 		       btv->tuner_type, radio ? "yes" : "no");
 }