---

yaml --- r: 113951 b: refs/heads/master c: 2cf801e h: refs/heads/master i: 113949: ac3909e 113947: ff2d1ab 113943: 863ea40 113935: bfcadd9 113919: 68c3264 v: v3
git-mirror · Oct 12, 2008 · db355fd · db355fd
1 parent f20508c
commit db355fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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;