vserver 2.0 rc7

[linux-2.6.git] / drivers / media / dvb / dibusb / dvb-dibusb-firmware.c

diff --git a/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c b/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c
index 972548a..504ba47 100644 (file)
--- a/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c
+++ b/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c
@@ -19,7 +19,7 @@
 static int dibusb_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 len)
 {
        return usb_control_msg(udev, usb_sndctrlpipe(udev,0),
-                       0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5*HZ);
+                       0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5000);
 }
 
 int dibusb_loadfirmware(struct usb_device *udev, struct dibusb_usb_device *dibdev)
@@ -30,11 +30,13 @@ int dibusb_loadfirmware(struct usb_device *udev, struct dibusb_usb_device *dibde
        int ret = 0,i;
        
        if ((ret = request_firmware(&fw, dibdev->dev_cl->firmware, &udev->dev)) != 0) {
-               err("did not find a valid firmware file. (%s) "
+               err("did not find the firmware file. (%s) "
                        "Please see linux/Documentation/dvb/ for more details on firmware-problems.",
                        dibdev->dev_cl->firmware);
                return ret;
        }
+
+       info("downloading firmware from file '%s'.",dibdev->dev_cl->firmware);
        
        p = kmalloc(fw->size,GFP_KERNEL);       
        if (p != NULL) {