From db355fd22e97b33eb266b5c650f7406868640ffc Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 8 Sep 2008 12:07:06 -0300 Subject: [PATCH] --- yaml --- r: 113951 b: refs/heads/master c: 2cf801e3e38f649d25fe3b4e236976f45e26289f h: refs/heads/master i: 113949: ac3909ef797272a8b6511e1a2974cde1d8ae8517 113947: ff2d1ab6c6818fc0688e239ad41291d2cf819fc8 113943: 863ea40b30d5a066aba01dba674bf682ae305872 113935: bfcadd908e032cf17d7e273e1b3496db158512da 113919: 68c326429df02b54cf48f87a549218ac3ff94709 v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/CARDLIST.cx88 | 1 + trunk/drivers/media/dvb/dvb-core/dvb_frontend.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a25e4c5c91d..83fbd658f853 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af832623c2a44525df6e4ae0142fb0385479546c +refs/heads/master: 2cf801e3e38f649d25fe3b4e236976f45e26289f diff --git a/trunk/Documentation/video4linux/CARDLIST.cx88 b/trunk/Documentation/video4linux/CARDLIST.cx88 index c95a2fb70c30..b51485c16312 100644 --- a/trunk/Documentation/video4linux/CARDLIST.cx88 +++ b/trunk/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/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c index 86af06cf578c..620c62084029 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/trunk/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;