Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3084
b: refs/heads/master
c: cc89c22
h: refs/heads/master
v: v3
  • Loading branch information
Johannes Stezenbach authored and Linus Torvalds committed Jun 24, 2005
1 parent fb85c55 commit 20c7ede
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f756ead1366092b73467fe3b1fb23f61034e94f9
refs/heads/master: cc89c229d9d7ec63cd33e960c20e75b77bc987d0
4 changes: 3 additions & 1 deletion trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <linux/moduleparam.h>
#include <linux/list.h>
#include <linux/suspend.h>
#include <linux/jiffies.h>
#include <asm/processor.h>
#include <asm/semaphore.h>

Expand Down Expand Up @@ -327,7 +328,8 @@ static int dvb_frontend_is_exiting(struct dvb_frontend *fe)
return 1;

if (fepriv->dvbdev->writers == 1)
if (jiffies - fepriv->release_jiffies > dvb_shutdown_timeout * HZ)
if (time_after(jiffies, fepriv->release_jiffies +
dvb_shutdown_timeout * HZ))
return 1;

return 0;
Expand Down

0 comments on commit 20c7ede

Please sign in to comment.