Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d39da3d authored by Russ Dill's avatar Russ Dill Committed by David S. Miller
Browse files

[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: default avatarRuss Dill <Russ.Dill@asu.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 877364e6

drivers/net/usb/mcs7830.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}