diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 5 |
1 files changed, 2 insertions, 3 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) | |||
465 | if (itv->options.radio == -1) | 465 | if (itv->options.radio == -1) |
466 | itv->options.radio = (tv.has_radio != 0); | 466 | itv->options.radio = (tv.has_radio != 0); |
467 | /* only enable newi2c if an IR blaster is present */ | 467 | /* only enable newi2c if an IR blaster is present */ |
468 | /* FIXME: for 2.6.20 the test against 2 should be removed */ | 468 | if (itv->options.newi2c == -1 && tv.has_ir) { |
469 | if (itv->options.newi2c == -1 && tv.has_ir != -1 && tv.has_ir != 2) { | 469 | itv->options.newi2c = (tv.has_ir & 4) ? 1 : 0; |
470 | itv->options.newi2c = (tv.has_ir & 2) ? 1 : 0; | ||
471 | if (itv->options.newi2c) { | 470 | if (itv->options.newi2c) { |
472 | IVTV_INFO("Reopen i2c bus for IR-blaster support\n"); | 471 | IVTV_INFO("Reopen i2c bus for IR-blaster support\n"); |
473 | exit_ivtv_i2c(itv); | 472 | exit_ivtv_i2c(itv); |