diff options
Diffstat (limited to 'linux/drivers/media/dvb/dibusb/dvb-dibusb.c')
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/dvb-dibusb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb.c index 0bf61e8d5..02a76200f 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb.c +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb.c @@ -20,7 +20,7 @@ * Amaury Demol (ademol@dibcom.fr) from DiBcom for providing specs and driver * sources, on which this driver (and the dib3000mb frontend) are based. * - * $Id: dvb-dibusb.c,v 1.8 2004/09/28 19:36:44 pmp Exp $ + * $Id: dvb-dibusb.c,v 1.9 2004/09/30 21:29:28 pmp Exp $ * * see Documentation/dvb/README.dibusb for more information */ @@ -540,7 +540,6 @@ static int dibusb_init(struct usb_dibusb *dib) &dib->buffer[i*DIBUSB_TS_URB_BUFFER_SIZE], DIBUSB_TS_URB_BUFFER_SIZE, dibusb_urb_complete, dib); dib->buf_urb[i]->transfer_flags = 0; - dib->buf_urb[i]->timeout = 0; if ((ret = usb_submit_urb(dib->buf_urb[i],GFP_KERNEL))) { err("could not submit buffer urb no. %d\n",i); @@ -632,8 +631,11 @@ static int dibusb_loadfirmware(struct usb_device *udev, ret = 0; /* restart the CPU */ reset = 0; - if (ret || (ret = dibusb_writemem(udev,DIBUSB_CPU_CSREG,&reset,1)) != 1) + if (ret || dibusb_writemem(udev,DIBUSB_CPU_CSREG,&reset,1) != 1) { err("could not restart the USB controller CPU."); + ret = -EINVAL; + } + kfree(p); } else { |