diff options
author | Patrick Boettcher <pb@linuxtv.org> | 2005-07-07 20:58:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:24:02 -0400 |
commit | e161f817bebecc1c1cc461dc83cce2eafbed9ee9 (patch) | |
tree | 315d52418f129836bb655aa8c8cf9955c536dfd8 /drivers/media | |
parent | 58769a5486bec8ed44b3b51029f8df8f13cddd5a (diff) |
[PATCH] dvb: usb: dont use HZ for timeouts
Don't use HZ for usb-transfer-timeouts.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c index dcd8c2f915f8..f5799a4c228e 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c | |||
@@ -29,7 +29,7 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, | |||
29 | 29 | ||
30 | ret = usb_bulk_msg(d->udev,usb_sndbulkpipe(d->udev, | 30 | ret = usb_bulk_msg(d->udev,usb_sndbulkpipe(d->udev, |
31 | d->props.generic_bulk_ctrl_endpoint), wbuf,wlen,&actlen, | 31 | d->props.generic_bulk_ctrl_endpoint), wbuf,wlen,&actlen, |
32 | 2*HZ); | 32 | 2000); |
33 | 33 | ||
34 | if (ret) | 34 | if (ret) |
35 | err("bulk message failed: %d (%d/%d)",ret,wlen,actlen); | 35 | err("bulk message failed: %d (%d/%d)",ret,wlen,actlen); |
@@ -43,7 +43,7 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, | |||
43 | 43 | ||
44 | ret = usb_bulk_msg(d->udev,usb_rcvbulkpipe(d->udev, | 44 | ret = usb_bulk_msg(d->udev,usb_rcvbulkpipe(d->udev, |
45 | d->props.generic_bulk_ctrl_endpoint),rbuf,rlen,&actlen, | 45 | d->props.generic_bulk_ctrl_endpoint),rbuf,rlen,&actlen, |
46 | 2*HZ); | 46 | 2000); |
47 | 47 | ||
48 | if (ret) | 48 | if (ret) |
49 | err("recv bulk message failed: %d",ret); | 49 | err("recv bulk message failed: %d",ret); |