summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Toth <stoth@linuxtv.org>2008-09-08 11:07:06 -0400
committerSteven Toth <stoth@linuxtv.org>2008-09-08 11:07:06 -0400
commit6d9b01f13a3c2d24b45b7ca718606854e8cdf17a (patch)
treed8ce407e2d3706838791aa4efbb03f4ffa814dd0
parent06e3dd65bdfbd21a9b3b64a344cdb2304b7e898a (diff)
downloadmediapointer-dvb-s2-6d9b01f13a3c2d24b45b7ca718606854e8cdf17a.tar.gz
mediapointer-dvb-s2-6d9b01f13a3c2d24b45b7ca718606854e8cdf17a.tar.bz2
S2API: DVB-S/S2 voltage selection bug fix
From: Steven Toth <stoth@linuxtv.org> Thanks to Hans Werner for finding the problem. Priority: normal Signed-off-by: Steven Toth <stoth@linuxtv.org>
-rw-r--r--linux/Documentation/video4linux/CARDLIST.cx881
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_frontend.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88
index c95a2fb70..b51485c16 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx88
+++ b/linux/Documentation/video4linux/CARDLIST.cx88
@@ -68,3 +68,4 @@
67 -> Kworld PlusTV HD PCI 120 (ATSC 120) [17de:08c1]
68 -> Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid [0070:6900,0070:6904,0070:6902]
69 -> Hauppauge WinTV-HVR4000(Lite) DVB-S/S2 [0070:6905,0070:6906]
+ 70 -> TeVii S460 DVB-S/S2 [D460:9022]
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index e17dd050c..fbe2b8c6d 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1301,7 +1301,7 @@ int tv_property_process(struct dvb_frontend *fe, tv_property_t *tvp,
case TV_SET_VOLTAGE:
fe->tv_property_cache.voltage = tvp->u.data;
r = dvb_frontend_ioctl_legacy(inode, file, FE_SET_VOLTAGE,
- &fe->tv_property_cache.voltage);
+ (void *)fe->tv_property_cache.voltage);
break;
case TV_GET_VOLTAGE:
tvp->u.data = fe->tv_property_cache.voltage;