From 1d69b222a803dc7d1cbc4bcb4e949a0748c16d14 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Mon, 7 Apr 2008 02:57:13 -0300
Subject: [PATCH] --- yaml --- r: 92785 b: refs/heads/master c:
 13e027a8bf2a507334fa0d30246ce619ff581cbb h: refs/heads/master i:   92783:
 13dc86b86cd6db3612585a32aa05cb6d02babb52 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c | 6 +-----
 trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.h | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 871a1eb3e84f..0dc19ec404fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97f26ff6049a7fff5460cebe392ad1d699dc434c
+refs/heads/master: 13e027a8bf2a507334fa0d30246ce619ff581cbb
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c
index d82fceae4689..c20eef0f077e 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c
@@ -41,7 +41,6 @@ static int pvr2_dvb_feed_func(struct pvr2_dvb_adapter *adap)
 	stream = adap->channel.stream->stream;
 
 	for (;;) {
-		if (adap->feed_thread_stop) break;
 		if (kthread_should_stop()) break;
 
 		/* Not sure about this... */
@@ -76,7 +75,7 @@ static int pvr2_dvb_feed_func(struct pvr2_dvb_adapter *adap)
 		ret = wait_event_interruptible(
 		    adap->buffer_wait_data,
 		    (pvr2_stream_get_ready_count(stream) > 0) ||
-		    adap->feed_thread_stop);
+		    kthread_should_stop());
 		if (ret < 0) break;
 	}
 
@@ -110,8 +109,6 @@ static void pvr2_dvb_stream_end(struct pvr2_dvb_adapter *adap)
 	struct pvr2_stream *stream;
 
 	if (adap->thread) {
-		adap->feed_thread_stop = !0;
-		pvr2_dvb_notify(adap);
 		kthread_stop(adap->thread);
 		adap->thread = NULL;
 	}
@@ -182,7 +179,6 @@ static int pvr2_dvb_stream_do_start(struct pvr2_dvb_adapter *adap)
 		if (ret < 0) return ret;
 	}
 
-	adap->feed_thread_stop = 0;
 	adap->thread = kthread_run(pvr2_dvb_feed_thread, adap, "pvrusb2-dvb");
 
 	if (IS_ERR(adap->thread)) {
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.h
index 2dd0d4ef22a2..884ff916a352 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.h
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.h
@@ -28,7 +28,6 @@ struct pvr2_dvb_adapter {
 	unsigned int		stream_run:1;
 
 	wait_queue_head_t	buffer_wait_data;
-	int			feed_thread_stop;
 	char			*buffer_storage[PVR2_DVB_BUFFER_COUNT];
 };