1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index cf235d84d8b7..db815c2da7ed 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -823,19 +823,18 @@ static int dummy_pullup (struct usb_gadget *_gadget, int value)
 
         if (value && dum->driver) {
                 if (mod_data.is_super_speed)
-                        dum->gadget.speed = dum->driver->speed;
+                        dum->gadget.speed = dum->driver->max_speed;
                 else if (mod_data.is_high_speed)
                         dum->gadget.speed = min_t(u8, USB_SPEED_HIGH,
-                                        dum->driver->speed);
+                                        dum->driver->max_speed);
                 else
                         dum->gadget.speed = USB_SPEED_FULL;
                 dummy_udc_udpate_ep0(dum);
 
-                if (dum->gadget.speed < dum->driver->speed)
+                if (dum->gadget.speed < dum->driver->max_speed)
                         dev_dbg(udc_dev(dum), "This device can perform faster"
-                                        " if you connect it to a %s port...\n",
-                                        (dum->driver->speed == USB_SPEED_SUPER ?
-                                         "SuperSpeed" : "HighSpeed"));
+                                " if you connect it to a %s port...\n",
+                                usb_speed_string(dum->driver->max_speed));
         }
         dum_hcd = gadget_to_dummy_hcd(_gadget);
 
@@ -898,7 +897,7 @@ static int dummy_udc_start(struct usb_gadget *g,
         struct dummy_hcd        *dum_hcd = gadget_to_dummy_hcd(g);
         struct dummy            *dum = dum_hcd->dum;
 
-        if (driver->speed == USB_SPEED_UNKNOWN)
+        if (driver->max_speed == USB_SPEED_UNKNOWN)
                 return -EINVAL;
 
         /*