projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'isci-for-3.5' into misc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
usb
/
usbnet.c
diff --git
a/drivers/net/usb/usbnet.c
b/drivers/net/usb/usbnet.c
index b7b3f5b0d40654c3c50b18ae56c969c03382c71c..2d927fb4adf4ea6805b2aeb02d06c8cb5108f496 100644
(file)
--- a/
drivers/net/usb/usbnet.c
+++ b/
drivers/net/usb/usbnet.c
@@
-210,6
+210,7
@@
static int init_status (struct usbnet *dev, struct usb_interface *intf)
} else {
usb_fill_int_urb(dev->interrupt, dev->udev, pipe,
buf, maxp, intr_complete, dev, period);
} else {
usb_fill_int_urb(dev->interrupt, dev->udev, pipe,
buf, maxp, intr_complete, dev, period);
+ dev->interrupt->transfer_flags |= URB_FREE_BUFFER;
dev_dbg(&intf->dev,
"status ep%din, %d bytes period %d\n",
usb_pipeendpoint(pipe), maxp, period);
dev_dbg(&intf->dev,
"status ep%din, %d bytes period %d\n",
usb_pipeendpoint(pipe), maxp, period);
@@
-1443,7
+1444,7
@@
usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
status = register_netdev (net);
if (status)
status = register_netdev (net);
if (status)
- goto out
3
;
+ goto out
4
;
netif_info(dev, probe, dev->net,
"register '%s' at usb-%s-%s, %s, %pM\n",
udev->dev.driver->name,
netif_info(dev, probe, dev->net,
"register '%s' at usb-%s-%s, %s, %pM\n",
udev->dev.driver->name,
@@
-1461,6
+1462,8
@@
usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
return 0;
return 0;
+out4:
+ usb_free_urb(dev->interrupt);
out3:
if (info->unbind)
info->unbind (dev, udev);
out3:
if (info->unbind)
info->unbind (dev, udev);