summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 017d30ad0..44423ff1a 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -1018,7 +1018,6 @@ static void pvr2_v4l2_notify(struct pvr2_v4l2_fh *fhp)
wake_up(&fhp->wait_data);
}
-
static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh)
{
int ret;
@@ -1034,7 +1033,7 @@ static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh)
return ret;
}
- fh->rhp = pvr2_ioread_create();
+ fh->rhp = pvr2_channel_create_mpeg_stream(fh->dev_info->stream);
if (!fh->rhp) {
pvr2_channel_claim_stream(&fh->channel,0);
return -ENOMEM;
@@ -1042,7 +1041,6 @@ static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh)
hdw = fh->channel.mc_head->hdw;
sp = fh->dev_info->stream->stream;
- pvr2_ioread_setup(fh->rhp,sp);
pvr2_stream_set_callback(sp,(pvr2_stream_callback)pvr2_v4l2_notify,fh);
pvr2_hdw_set_stream_type(hdw,fh->dev_info->config);
pvr2_hdw_set_streaming(hdw,!0);