diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 08:08:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 08:08:23 +0200 |
| commit | 7a51da5ff1e2b2c9397d781d04d0165371e80c6c (patch) | |
| tree | 8b22cfc0db8b3b8c90876017e08d834442851b44 /drivers | |
| parent | b927df0329a97dcfe9ba22b45375be2dc416dcd6 (diff) | |
| parent | a622565d06b0747458b59240c71f92b6925f562c (diff) | |
| download | barebox-7a51da5ff1e2b2c9397d781d04d0165371e80c6c.tar.gz barebox-7a51da5ff1e2b2c9397d781d04d0165371e80c6c.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index a51cfda328..33d900b706 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -125,7 +125,7 @@ static int usbnet_recv(struct eth_device *edev) len = dev->rx_urb_size; - ret = usb_bulk_msg(dev->udev, dev->in, rx_buf, len, &alen, 1000); + ret = usb_bulk_msg(dev->udev, dev->in, rx_buf, len, &alen, 1); if (ret) return ret; |