summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2007-01-19 21:28:15 -0600
committerMike Isely <isely@pobox.com>2007-01-19 21:28:15 -0600
commitc04a9a3e4d34ce866a1ff2e391b5e89215060be7 (patch)
tree7127e2e5ed85e7ce1c6959369e1478770eb45f8d /linux/drivers/media/video
parenteb5539384fc4026586b17b6c80da65362cb072bd (diff)
downloadmediapointer-dvb-s2-c04a9a3e4d34ce866a1ff2e391b5e89215060be7.tar.gz
mediapointer-dvb-s2-c04a9a3e4d34ce866a1ff2e391b5e89215060be7.tar.bz2
pvrusb2: Minor dead code / comment cleanups
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c7
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c4
2 files changed, 3 insertions, 8 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index d4c304bcb..c27933665 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -1143,13 +1143,6 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
}
memcpy(&dip->devbase,&vdev_template,sizeof(vdev_template));
-#if 0
- /* ????? This relation may be problematic on a disconnect. Is this
- really needed? I can't seem to find a reason for it. This
- can't be a required thing - what if the video device being set
- up doesn't have a real hardware device under it? */
- dip->vdev->dev = &usbdev->dev;
-#endif
dip->devbase.release = pvr2_video_device_release;
mindevnum = -1;
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index 779ac25f7..5f4067131 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -66,7 +66,9 @@ static void set_input(struct pvr2_v4l_decoder *ctxt)
route.input = SAA7115_SVIDEO2;
break;
case PVR2_CVAL_INPUT_RADIO:
- // ????? No idea yet what to do here
+ // In radio mode, we mute the video, but point at one
+ // spot just to stay consistent
+ route.input = SAA7115_COMPOSITE5;
default:
return;
}