summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRuss Dill <Russ.Dill@asu.edu>2008-01-07 23:15:41 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-08 23:30:19 -0800
commit1d39da3dcaad4231f0fa75024b1d6d710a2ced74 (patch)
tree6366b8cdf1ef267ad7ee3850ce922144cd63dba1 /drivers
parent877364e60edeea06efa8ceb9d29201f195af8a47 (diff)
downloadlinux-stable-1d39da3dcaad4231f0fa75024b1d6d710a2ced74.tar.gz
linux-stable-1d39da3dcaad4231f0fa75024b1d6d710a2ced74.tar.bz2
linux-stable-1d39da3dcaad4231f0fa75024b1d6d710a2ced74.zip
[NET]: mcs7830 passes msecs instead of jiffies to usb_control_msg
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/usb/mcs7830.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index f55a5951733a..5ea7411e1337 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;
}