Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285439
b: refs/heads/master
c: b9d5efc
h: refs/heads/master
i:
  285437: 0ceaef3
  285435: 357907b
  285431: 4dea3c8
  285423: 45b8c3e
  285407: df05f08
  285375: fb871ff
  285311: 938aa4a
  285183: 72c9568
v: v3
  • Loading branch information
Andreas Oberritter authored and Mauro Carvalho Chehab committed Dec 30, 2011
1 parent 4461339 commit 3f73f14
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 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: a1dca1e30ac7991d8a90a3377008c850eb466edf
refs/heads/master: b9d5efcceb6b34ee20111b62cf7be61ae79af4e9
7 changes: 5 additions & 2 deletions trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ static int dvb_frontend_is_exiting(struct dvb_frontend *fe)
return 1;

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

Expand Down Expand Up @@ -2116,12 +2116,15 @@ static int dvb_frontend_release(struct inode *inode, struct file *file)

dprintk ("%s\n", __func__);

if ((file->f_flags & O_ACCMODE) != O_RDONLY)
if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
fepriv->release_jiffies = jiffies;
mb();
}

ret = dvb_generic_release (inode, file);

if (dvbdev->users == -1) {
wake_up(&fepriv->wait_queue);
if (fepriv->exit != DVB_FE_NO_EXIT) {
fops_put(file->f_op);
file->f_op = NULL;
Expand Down

0 comments on commit 3f73f14

Please sign in to comment.