summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Toth <stoth@linuxtv.org>2008-09-08 12:07:06 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:37:04 -0200
commit2cf801e3e38f649d25fe3b4e236976f45e26289f (patch)
treedbb926e7798792fc980eb2daf561d71b740f1fea
parentaf832623c2a44525df6e4ae0142fb0385479546c (diff)
downloadkernel-crypto-2cf801e3e38f649d25fe3b4e236976f45e26289f.tar.gz
kernel-crypto-2cf801e3e38f649d25fe3b4e236976f45e26289f.tar.xz
kernel-crypto-2cf801e3e38f649d25fe3b4e236976f45e26289f.zip
V4L/DVB (8990): S2API: DVB-S/S2 voltage selection bug fix
Thanks to Hans Werner for finding the problem. Signed-off-by: Steven Toth <stoth@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.cx881
-rw-r--r--drivers/media/dvb/dvb-core/dvb_frontend.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index c95a2fb70c3..b51485c1631 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/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/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 86af06cf578..620c6208402 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1290,7 +1290,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;