diff options
| author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 20:25:22 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 20:25:22 +0300 |
| commit | 4302c15ea237a649780894e263125fcd8c548998 (patch) | |
| tree | ccddac5c9a79e7adc16ea238392b4dc55c8998fb /drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | |
| parent | 0144f31466f0b7f1a8b21b470bfeb93c174a2006 (diff) | |
| download | linux-4302c15ea237a649780894e263125fcd8c548998.tar.xz | |
V4L/DVB (3145): syncronizes some changes between v4l and dvb
- digitv_ctrl_msg() if (wo) test is reversed. fixed.
- usb timeout is in Hz, not in jiffies.
- NULL replaced by 0 to be coherent.
- removed uneeded headers.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-firmware.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c index ab87af99d36f..51ce7403999b 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c @@ -30,7 +30,7 @@ static struct usb_cypress_controller cypress[] = { static int usb_cypress_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); } static int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type) |