diff options
Diffstat (limited to 'linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c')
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c index 97747cc4e..2683f4559 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c @@ -65,16 +65,14 @@ static int dibusb_ctrl_feed(struct usb_dibusb *dib, int pid, int onoff) * stop feed before setting a new pid and firmware_bug * or if there will be no pid anymore */ - if ((dib->dibdev->parm->firmware_bug && dib->feedcount) || newfeedcount == 0) { +// if ((dib->dibdev->parm->firmware_bug && dib->feedcount) || + if (newfeedcount == 0) { deb_ts("stop feeding\n"); if (dib->xfer_ops.fifo_ctrl != NULL) { if (dib->xfer_ops.fifo_ctrl(dib->fe,0)) { err("error while inhibiting fifo."); return -ENODEV; } - } else { - err("fifo_ctrl is not set."); - return -ENODEV; } } @@ -86,9 +84,6 @@ static int dibusb_ctrl_feed(struct usb_dibusb *dib, int pid, int onoff) err("no free pid in list."); return -ENODEV; } - } else { - err("no pid ctrl callback."); - return -ENODEV; } } @@ -98,8 +93,8 @@ static int dibusb_ctrl_feed(struct usb_dibusb *dib, int pid, int onoff) * reception. */ - if ((dib->dibdev->parm->firmware_bug || dib->feedcount == onoff) && - dib->feedcount > 0) { +// if ((dib->dibdev->parm->firmware_bug || dib->feedcount == onoff) && + if (dib->feedcount > 0) { deb_ts("controlling pid parser\n"); if (dib->xfer_ops.pid_parse != NULL) { @@ -114,9 +109,6 @@ static int dibusb_ctrl_feed(struct usb_dibusb *dib, int pid, int onoff) err("error while enabling fifo."); return -ENODEV; } - } else { - err("fifo_ctrl is not set."); - return -ENODEV; } dibusb_streaming(dib,1); } |