summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorAndreas Oberritter <devnull@localhost>2002-12-17 21:35:20 +0000
committerAndreas Oberritter <devnull@localhost>2002-12-17 21:35:20 +0000
commit0164a253485b3a532830b59ae532f723fd85a5e7 (patch)
treef33ac845a8e5ab17df085166404a6047a599f6e7 /linux/drivers/media/dvb
parentcf401831b01431d455d70fb64a8f5e1d3b947e26 (diff)
downloadmediapointer-dvb-s2-0164a253485b3a532830b59ae532f723fd85a5e7.tar.gz
mediapointer-dvb-s2-0164a253485b3a532830b59ae532f723fd85a5e7.tar.bz2
stop fe thread without FE_SLEEP if shutdown timeout is 0
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_frontend.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index 493ae0203..179d1af24 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -418,7 +418,7 @@ int dvb_frontend_is_exiting (struct dvb_frontend_data *fe)
if (fe->exit)
return 1;
- if (fe->dvbdev->users == 1 && dvb_shutdown_timeout)
+ if (fe->dvbdev->users == 1)
if (jiffies - fe->release_jiffies > dvb_shutdown_timeout * HZ)
return 1;
@@ -494,7 +494,9 @@ int dvb_frontend_thread (void *data)
dvb_frontend_add_event (fe, s);
};
- dvb_frontend_internal_ioctl (&fe->frontend, FE_SLEEP, NULL);
+ if (dvb_shutdown_timeout)
+ dvb_frontend_internal_ioctl (&fe->frontend, FE_SLEEP, NULL);
+
up (&fe->sem);
fe->thread = NULL;
return 0;