diff options
| author | Russ Dill <Russ.Dill@asu.edu> | 2008-01-11 01:19:55 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-06 11:43:41 -0800 |
| commit | c6b745a41e6b6e15cf637db23f054d85ca3cff31 (patch) | |
| tree | 2bdc23ce2c239a821eed353ed2a964fcc2bf06b2 /drivers | |
| parent | f63145cd2ee2cba87fb7b61ef7c06c034c889a5a (diff) | |
NET: mcs7830 passes msecs instead of jiffies to usb_control_msg
[NET]: mcs7830 passes msecs instead of jiffies to usb_control_msg
[ Upstream commit 1d39da3dcaad4231f0fa75024b1d6d710a2ced74 ]
usb_control_msg was changed long ago (2.6.12-pre) to take milliseconds
instead of jiffies. Oddly, mcs7830 wasn't added until 2.6.19-rc3.
Signed-off-by: Russ Dill <Russ.Dill@asu.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/usb/mcs7830.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index 6240b978fe3..3bbc5c4f79b 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c @@ -94,7 +94,7 @@ static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data) ret = usb_control_msg(xdev, usb_rcvctrlpipe(xdev, 0), MCS7830_RD_BREQ, MCS7830_RD_BMREQ, 0x0000, index, data, - size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT)); + size, MCS7830_CTRL_TIMEOUT); return ret; } @@ -105,7 +105,7 @@ static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, void *data) ret = usb_control_msg(xdev, usb_sndctrlpipe(xdev, 0), MCS7830_WR_BREQ, MCS7830_WR_BMREQ, 0x0000, index, data, - size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT)); + size, MCS7830_CTRL_TIMEOUT); return ret; } |