From 72fb0c6feaa13f84bca5b130de44b20c0c61c735 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Wed, 6 Feb 2008 04:24:51 -0300 Subject: [PATCH] --- yaml --- r: 92759 b: refs/heads/master c: ceb4340deb9bf5f8371d47ef906a83e6784345b0 h: refs/heads/master i: 92757: 5c90b71ea23f8d0d56450a55908914c915b684f0 92755: 0f578c120a338dde91e0ef2bf9c07723a952a6e1 92751: afdcc26637664161c635df0e345a320ebc38dbb3 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index baede2a9ed9f..3c7d8d0aadb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2780fb41102f9844ae6182c03908f03c3cb9163 +refs/heads/master: ceb4340deb9bf5f8371d47ef906a83e6784345b0 diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c index 69ac59aa654c..dd693a1980e8 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c @@ -138,9 +138,8 @@ static void pvr2_dvb_fh_done(struct pvr2_dvb_fh *fh) pvr2_channel_done(&fh->channel); } -static int pvr2_dvb_feed_thread(void *data) +static int pvr2_dvb_feed_func(struct pvr2_dvb_adapter *adap) { - struct pvr2_dvb_adapter *adap = data; struct pvr2_dvb_fh fh; int ret; unsigned int count; @@ -203,12 +202,18 @@ static int pvr2_dvb_feed_thread(void *data) printk(KERN_DEBUG "dvb thread stopped\n"); + return 0; +} + +static int pvr2_dvb_feed_thread(void *data) +{ + int stat = pvr2_dvb_feed_func(data); /* from videobuf-dvb.c: */ while (!kthread_should_stop()) { set_current_state(TASK_INTERRUPTIBLE); schedule(); } - return 0; + return stat; } static int pvr2_dvb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)