diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/vp7045.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/vp7045.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c index 72d5d3f74463..5adc5d69ec84 100644 --- a/drivers/media/dvb/dvb-usb/vp7045.c +++ b/drivers/media/dvb/dvb-usb/vp7045.c | |||
@@ -44,7 +44,7 @@ int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, | |||
44 | if (usb_control_msg(d->udev, | 44 | if (usb_control_msg(d->udev, |
45 | usb_sndctrlpipe(d->udev,0), | 45 | usb_sndctrlpipe(d->udev,0), |
46 | TH_COMMAND_OUT, USB_TYPE_VENDOR | USB_DIR_OUT, 0, 0, | 46 | TH_COMMAND_OUT, USB_TYPE_VENDOR | USB_DIR_OUT, 0, 0, |
47 | outbuf, 20, 2*HZ) != 20) { | 47 | outbuf, 20, 2000) != 20) { |
48 | err("USB control message 'out' went wrong."); | 48 | err("USB control message 'out' went wrong."); |
49 | ret = -EIO; | 49 | ret = -EIO; |
50 | goto unlock; | 50 | goto unlock; |
@@ -55,7 +55,7 @@ int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, | |||
55 | if (usb_control_msg(d->udev, | 55 | if (usb_control_msg(d->udev, |
56 | usb_rcvctrlpipe(d->udev,0), | 56 | usb_rcvctrlpipe(d->udev,0), |
57 | TH_COMMAND_IN, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, | 57 | TH_COMMAND_IN, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, |
58 | inbuf, 12, 2*HZ) != 12) { | 58 | inbuf, 12, 2000) != 12) { |
59 | err("USB control message 'in' went wrong."); | 59 | err("USB control message 'in' went wrong."); |
60 | ret = -EIO; | 60 | ret = -EIO; |
61 | goto unlock; | 61 | goto unlock; |
@@ -255,7 +255,7 @@ static struct dvb_usb_properties vp7045_properties = { | |||
255 | /* usb specific object needed to register this driver with the usb subsystem */ | 255 | /* usb specific object needed to register this driver with the usb subsystem */ |
256 | static struct usb_driver vp7045_usb_driver = { | 256 | static struct usb_driver vp7045_usb_driver = { |
257 | .owner = THIS_MODULE, | 257 | .owner = THIS_MODULE, |
258 | .name = "dvb-usb-vp7045", | 258 | .name = "dvb_usb_vp7045", |
259 | .probe = vp7045_usb_probe, | 259 | .probe = vp7045_usb_probe, |
260 | .disconnect = dvb_usb_device_exit, | 260 | .disconnect = dvb_usb_device_exit, |
261 | .id_table = vp7045_usb_table, | 261 | .id_table = vp7045_usb_table, |