diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-12 15:30:19 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-12 15:30:19 -0200 |
| commit | 09aed8a358a9de22ae31897cb5a9b82f7fa73310 (patch) | |
| tree | 9d4b51895a42b7018cfd6b85d8f1e36d32192fdf /linux/drivers/media/video/tveeprom.c | |
| parent | 7b002be60b03a06493b32634f963bdf5c9b9d87e (diff) | |
| parent | 0d93b580aad1ef28486437831a00212fea35356f (diff) | |
| download | mediapointer-dvb-s2-09aed8a358a9de22ae31897cb5a9b82f7fa73310.tar.gz mediapointer-dvb-s2-09aed8a358a9de22ae31897cb5a9b82f7fa73310.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/tveeprom.c')
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 2b290a731..dd06107a3 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -434,7 +434,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 = 2; + tvee->has_ir = -1; tvee->model = eeprom_data[i+8] + (eeprom_data[i+9] << 8); @@ -657,13 +657,14 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, STRM(decoderIC, tvee->decoder_processor), tvee->decoder_processor); } - if (tvee->has_ir == 2) + if (tvee->has_ir == -1) tveeprom_info("has %sradio\n", tvee->has_radio ? "" : "no "); else - tveeprom_info("has %sradio, has %sIR remote\n", + tveeprom_info("has %sradio, has %sIR receiver, has %sIR transmitter\n", tvee->has_radio ? "" : "no ", - tvee->has_ir ? "" : "no "); + (tvee->has_ir & 1) ? "" : "no ", + (tvee->has_ir & 2) ? "" : "no "); } EXPORT_SYMBOL(tveeprom_hauppauge_analog); |