projects
/
platform
/
kernel
/
linux-arm64.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
877364e
)
[NET]: mcs7830 passes msecs instead of jiffies to usb_control_msg
author
Russ Dill
<Russ.Dill@asu.edu>
Tue, 8 Jan 2008 07:15:41 +0000
(23:15 -0800)
committer
David S. Miller
<davem@davemloft.net>
Wed, 9 Jan 2008 07:30:19 +0000
(23:30 -0800)
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>
drivers/net/usb/mcs7830.c
patch
|
blob
|
history
diff --git
a/drivers/net/usb/mcs7830.c
b/drivers/net/usb/mcs7830.c
index
f55a595
..
5ea7411
100644
(file)
--- 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;
}