diff --git a/[refs] b/[refs]
index 052812b256b7..cf77f1256d1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f17c5026ce27d0449903d34f9fca461a45fe1cb
+refs/heads/master: 830d1b188c997c4af094d4e20b194205ddbded13
diff --git a/trunk/drivers/usb/gadget/f_rndis.c b/trunk/drivers/usb/gadget/f_rndis.c
index 3279a4726042..424a37c5773f 100644
--- a/trunk/drivers/usb/gadget/f_rndis.c
+++ b/trunk/drivers/usb/gadget/f_rndis.c
@@ -475,7 +475,9 @@ static int rndis_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 		if (rndis->port.in_ep->driver_data) {
 			DBG(cdev, "reset rndis\n");
 			gether_disconnect(&rndis->port);
-		} else {
+		}
+
+		if (!rndis->port.in) {
 			DBG(cdev, "init rndis\n");
 			rndis->port.in = ep_choose(cdev->gadget,
 					rndis->hs.in, rndis->fs.in);