---

yaml
---
r: 321727
b: refs/heads/master
c: b1b552a
h: refs/heads/master
i:
  321725: 2071a4d
  321723: a2624ba
  321719: 4a743fa
  321711: ad37196
  321695: 31afef7
  321663: a7b5d5d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecc8a0cdca18df5c9a7e84ab29160259123f3ae5
+refs/heads/master: b1b552a69b8805e7e338074a9e8b670b4a795218

trunk/drivers/usb/gadget/u_ether.c

@@ -669,6 +669,8 @@ static int eth_stop(struct net_device *net)
 	spin_lock_irqsave(&dev->lock, flags);
 	if (dev->port_usb) {
 		struct gether	*link = dev->port_usb;
+		const struct usb_endpoint_descriptor *in;
+		const struct usb_endpoint_descriptor *out;
 
 		if (link->close)
 			link->close(link);
@@ -682,10 +684,14 @@ static int eth_stop(struct net_device *net)
 		 * their own pace; the network stack can handle old packets.
 		 * For the moment we leave this here, since it works.
 		 */
+		in = link->in_ep->desc;
+		out = link->out_ep->desc;
 		usb_ep_disable(link->in_ep);
 		usb_ep_disable(link->out_ep);
 		if (netif_carrier_ok(net)) {
 			DBG(dev, "host still using in/out endpoints\n");
+			link->in_ep->desc = in;
+			link->out_ep->desc = out;
 			usb_ep_enable(link->in_ep);
 			usb_ep_enable(link->out_ep);
 		}