Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4302
b: refs/heads/master
c: 6757ccc
h: refs/heads/master
v: v3
  • Loading branch information
Peter Beutner authored and Linus Torvalds committed Jul 8, 2005
1 parent 8c29ca1 commit ca89049
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 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: 25a26ec3b60b29300a652d7d81a69b6bc08b35b5
refs/heads/master: 6757ccc57d2cc4ab4e63d8aee97f2e6b9f998990
16 changes: 13 additions & 3 deletions trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -626,11 +626,21 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
break;
}

case FE_READ_STATUS:
case FE_READ_STATUS: {
fe_status_t* status = parg;

/* if retune was requested but hasn't occured yet, prevent
* that user get signal state from previous tuning */
if(fepriv->state == FESTATE_RETUNE) {
err=0;
*status = 0;
break;
}

if (fe->ops->read_status)
err = fe->ops->read_status(fe, (fe_status_t*) parg);
err = fe->ops->read_status(fe, status);
break;

}
case FE_READ_BER:
if (fe->ops->read_ber)
err = fe->ops->read_ber(fe, (__u32*) parg);
Expand Down

0 comments on commit ca89049

Please sign in to comment.