---

yaml --- r: 92759 b: refs/heads/master c: ceb4340 h: refs/heads/master i: 92757: 5c90b71 92755: 0f578c1 92751: afdcc26 v: v3
git-mirror · Apr 24, 2008 · 72fb0c6 · 72fb0c6
1 parent d947f3a
commit 72fb0c6
Show file tree

Hide file tree

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