summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2016-03-22 22:28:16 -0600
committerTom Rini <trini@konsulko.com>2016-04-01 17:17:40 -0400
commite320f0bc9b81076e4c59d281dff1428df5324809 (patch)
tree98e3b03a35130da955ce4e07c47c5f1836112d17 /drivers/usb
parentf8bb69643550fccbf1df514deda53089da7940e3 (diff)
downloadtalos-obmc-uboot-e320f0bc9b81076e4c59d281dff1428df5324809.tar.gz
talos-obmc-uboot-e320f0bc9b81076e4c59d281dff1428df5324809.zip
smsc95xx: fix operation on 64-bit systems
smsc95xx_read_reg() should calculate sizeof(*data) not sizeof(data) since data is a pointer, and the value pointed at is being transferred over USB, not the value of the pointer. This fixes operation of the driver in 64-bit builds, such as the Raspberry Pi 3. Reported-by: Eric Anholt <eric@anholt.net> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/eth/smsc95xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index 3099bf4fd4..08eaed5c2e 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -188,10 +188,10 @@ static int smsc95xx_read_reg(struct usb_device *udev, u32 index, u32 *data)
len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
USB_VENDOR_REQUEST_READ_REGISTER,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
- 0, index, tmpbuf, sizeof(data),
+ 0, index, tmpbuf, sizeof(*data),
USB_CTRL_GET_TIMEOUT);
*data = tmpbuf[0];
- if (len != sizeof(data)) {
+ if (len != sizeof(*data)) {
debug("smsc95xx_read_reg failed: index=%d, len=%d",
index, len);
return -EIO;
OpenPOWER on IntegriCloud