3 files changed, 16 insertions, 12 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 41fd79279bb5..aea1664948ce 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -465,9 +465,8 @@ static void ivtv_process_eeprom(struct ivtv *itv)
         if (itv->options.radio == -1)
                 itv->options.radio = (tv.has_radio != 0);
         /* only enable newi2c if an IR blaster is present */
-        /* FIXME: for 2.6.20 the test against 2 should be removed */
-        if (itv->options.newi2c == -1 && tv.has_ir != -1 && tv.has_ir != 2) {
-                itv->options.newi2c = (tv.has_ir & 2) ? 1 : 0;
+        if (itv->options.newi2c == -1 && tv.has_ir) {
+                itv->options.newi2c = (tv.has_ir & 4) ? 1 : 0;
                 if (itv->options.newi2c) {
                     IVTV_INFO("Reopen i2c bus for IR-blaster support\n");
                     exit_ivtv_i2c(itv);
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 93954c143237..fbfac1b3bd02 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -485,7 +485,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         tvee->has_radio = eeprom_data[i+len-1];
                         /* old style tag, don't know how to detect
                         IR presence, mark as unknown. */
-                        tvee->has_ir = -1;
+                        tvee->has_ir = 0;
                         tvee->model =
                                 eeprom_data[i+8] +
                                 (eeprom_data[i+9] << 8);
@@ -605,7 +605,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
 
                 case 0x0f:
                         /* tag 'IRInfo' */
-                        tvee->has_ir = eeprom_data[i+1];
+                        tvee->has_ir = 1 | (eeprom_data[i+1] << 1);
                         break;
 
                 /* case 0x10: tag 'VBIInfo' */
@@ -705,14 +705,14 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                 tveeprom_info("decoder processor is %s (idx %d)\n",
                         STRM(decoderIC, tvee->decoder_processor),
                         tvee->decoder_processor);
-        if (tvee->has_ir == -1)
-                tveeprom_info("has %sradio\n",
-                                tvee->has_radio ? "" : "no ");
-        else
+        if (tvee->has_ir)
                 tveeprom_info("has %sradio, has %sIR receiver, has %sIR transmitter\n",
                                 tvee->has_radio ? "" : "no ",
-                                (tvee->has_ir & 1) ? "" : "no ",
-                                (tvee->has_ir & 2) ? "" : "no ");
+                                (tvee->has_ir & 2) ? "" : "no ",
+                                (tvee->has_ir & 4) ? "" : "no ");
+        else
+                tveeprom_info("has %sradio\n",
+                                tvee->has_radio ? "" : "no ");
 }
 EXPORT_SYMBOL(tveeprom_hauppauge_analog);
 
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h
index 5660ea24996b..a8ad75a9152a 100644
--- a/include/media/tveeprom.h
+++ b/include/media/tveeprom.h
@@ -3,7 +3,12 @@
 
 struct tveeprom {
         u32 has_radio;
-        u32 has_ir;     /* bit 0: IR receiver present, bit 1: IR transmitter (blaster) present. -1 == unknown */
+        /* If has_ir == 0, then it is unknown what the IR capabilities are,
+           otherwise:
+           bit 0: 1 (= IR capabilities are known)
+           bit 1: IR receiver present
+           bit 2: IR transmitter (blaster) present */
+        u32 has_ir;
         u32 has_MAC_address; /* 0: no MAC, 1: MAC present, 2: unknown */
 
         u32 tuner_type;