summaryrefslogtreecommitdiffstats
path: root/include/media/tveeprom.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-22 20:50:31 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-26 17:54:42 +0200
commitb654fcdc0ea3b6e5724c9873ae062bdfe7f28efe (patch)
treea7cd44165baef31933053345a18279a4f66817e0 /include/media/tveeprom.h
parentV4L/DVB (8477): v4l: remove obsolete audiochip.h (diff)
downloadlinux-b654fcdc0ea3b6e5724c9873ae062bdfe7f28efe.tar.xz
linux-b654fcdc0ea3b6e5724c9873ae062bdfe7f28efe.zip
V4L/DVB (8479): tveeprom/ivtv: fix usage of has_ir field
has_ir was set to and compared to -1 in several cases, even though it is an u32. ivtv also contained a FIXME for an old kernel that could be removed. Thanks to Roel Kluin for creating an initial patch for this. Although I chose a different solution here it did help in pointing out the problem. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/tveeprom.h')
-rw-r--r--include/media/tveeprom.h7
1 files changed, 6 insertions, 1 deletions
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;