Merge branch 'master'

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index c3d8e5c5bf28..9c4422ac9de4 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2338,6 +2338,9 @@ autoconf_fail:
                 hs_subset_descriptors();
         }
 
+        device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
+        usb_gadget_set_selfpowered (gadget);
+
         /* For now RNDIS is always a second config */
         if (rndis)
                 device_desc.bNumConfigurations = 2;
@@ -2361,9 +2364,6 @@ autoconf_fail:
 #endif
 #endif  /* DUALSPEED */
 
-        device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
-        usb_gadget_set_selfpowered (gadget);
-
         if (gadget->is_otg) {
                 otg_descriptor.bmAttributes |= USB_OTG_HNP,
                 eth_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;