diff options
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/Kconfig | 3 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/dvb-dibusb.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/dvb-dibusb.h | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/dibusb/Kconfig b/linux/drivers/media/dvb/dibusb/Kconfig index 112650015..f4eb6566e 100644 --- a/linux/drivers/media/dvb/dibusb/Kconfig +++ b/linux/drivers/media/dvb/dibusb/Kconfig @@ -8,7 +8,8 @@ config DVB_DIBUSB Devices supported by this driver: - Twinhan VisionPlus VisionDTV USB-Ter (VP7041) + TwinhanDTV USB-Ter (VP7041) + TwinhanDTV Magic Box (VP7041e) KWorld V-Stream XPERT DTV - DVB-T USB Hama DVB-T USB-Box DiBcom reference device (non-public) 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 { diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h index 167367ad6..2e46a9f1c 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h @@ -7,7 +7,7 @@ * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 2. * - * $Id: dvb-dibusb.h,v 1.5 2004/09/28 19:36:44 pmp Exp $ + * $Id: dvb-dibusb.h,v 1.6 2004/09/30 21:29:28 pmp Exp $ * * for more information see dvb-dibusb.c . */ @@ -60,7 +60,7 @@ struct dibusb_device { static struct dibusb_device dibusb_devices[DIBUSB_SUPPORTED_DEVICES] = { { .cold_product_id = USB_PID_TWINHAN_VP7041_COLD_ID, .warm_product_id = USB_PID_TWINHAN_VP7041_WARM_ID, - .name = "Twinhan VisionDTV USB-Ter/HAMA USB DVB-T device", + .name = "TwinhanDTV USB-Ter/Magic Box / HAMA USB DVB-T device", .demod_addr = DIBUSB_DEMOD_I2C_ADDR_DEFAULT, }, { .cold_product_id = USB_PID_KWORLD_VSTREAM_COLD_ID, |