diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-29 04:59:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-29 04:59:29 -0700 |
| commit | 6876dc0e1339dbf51ed19fcfb933e615bd3808fc (patch) | |
| tree | 19077cc26d3364cb07045a95ca816ee7bb7a602a /drivers/usb/gadget/function | |
| parent | 80cb08efce94fb197b05bc1c9dfaeb72a765eb96 (diff) | |
| parent | ae81a07395be43d63d9fe8ec632a351626320ead (diff) | |
Merge "Merge android-4.4.186 (aeb051d) into msm-4.4"
Diffstat (limited to 'drivers/usb/gadget/function')
| -rw-r--r-- | drivers/usb/gadget/function/u_ether.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index a5f20634ab0a..df9466103f1e 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -217,11 +217,12 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags) out = dev->port_usb->out_ep; else out = NULL; - spin_unlock_irqrestore(&dev->lock, flags); if (!out) + { + spin_unlock_irqrestore(&dev->lock, flags); return -ENOTCONN; - + } /* Padding up to RX_EXTRA handles minor disagreements with host. * Normally we use the USB "terminate on short read" convention; @@ -245,6 +246,7 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags) if (dev->port_usb->is_fixed) size = max_t(size_t, size, dev->port_usb->fixed_out_len); + spin_unlock_irqrestore(&dev->lock, flags); DBG(dev, "%s: size: %zd\n", __func__, size); skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags); |