Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14872
b: refs/heads/master
c: 363bbf4
h: refs/heads/master
v: v3
  • Loading branch information
Patrick Boettcher authored and Linus Torvalds committed Dec 1, 2005
1 parent 318200a commit a14db28
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 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: ded928468407c8e08dcb6aedb91aaa97b80d5752
refs/heads/master: 363bbf42da23898ab48dc227cca9d80b50b481eb
18 changes: 9 additions & 9 deletions trunk/drivers/media/dvb/dvb-usb/dibusb-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ MODULE_LICENSE("GPL");
int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff)
{
if (d->priv != NULL) {
struct dib_fe_xfer_ops *ops = d->priv;
if (ops->fifo_ctrl != NULL)
if (ops->fifo_ctrl(d->fe,onoff)) {
struct dibusb_state *st = d->priv;
if (st->ops.fifo_ctrl != NULL)
if (st->ops.fifo_ctrl(d->fe,onoff)) {
err("error while controlling the fifo of the demod.");
return -ENODEV;
}
Expand All @@ -35,9 +35,9 @@ EXPORT_SYMBOL(dibusb_streaming_ctrl);
int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff)
{
if (d->priv != NULL) {
struct dib_fe_xfer_ops *ops = d->priv;
if (d->pid_filtering && ops->pid_ctrl != NULL)
ops->pid_ctrl(d->fe,index,pid,onoff);
struct dibusb_state *st = d->priv;
if (st->ops.pid_ctrl != NULL)
st->ops.pid_ctrl(d->fe,index,pid,onoff);
}
return 0;
}
Expand All @@ -46,9 +46,9 @@ EXPORT_SYMBOL(dibusb_pid_filter);
int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff)
{
if (d->priv != NULL) {
struct dib_fe_xfer_ops *ops = d->priv;
if (ops->pid_parse != NULL)
if (ops->pid_parse(d->fe,onoff) < 0)
struct dibusb_state *st = d->priv;
if (st->ops.pid_parse != NULL)
if (st->ops.pid_parse(d->fe,onoff) < 0)
err("could not handle pid_parser");
}
return 0;
Expand Down

0 comments on commit a14db28

Please sign in to comment.