1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 4d6ae3795a88..6ca9111d150a 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -375,7 +375,8 @@ out_err:
 
 #ifdef CONFIG_OF
 static void usb251xb_get_ports_field(struct usb251xb *hub,
-                                    const char *prop_name, u8 port_cnt, u8 *fld)
+                                    const char *prop_name, u8 port_cnt,
+                                    bool ds_only, u8 *fld)
 {
         struct device *dev = hub->dev;
         struct property *prop;
@@ -383,7 +384,7 @@ static void usb251xb_get_ports_field(struct usb251xb *hub,
         u32 port;
 
         of_property_for_each_u32(dev->of_node, prop_name, prop, p, port) {
-                if ((port >= 1) && (port <= port_cnt))
+                if ((port >= ds_only ? 1 : 0) && (port <= port_cnt))
                         *fld |= BIT(port);
                 else
                         dev_warn(dev, "port %u doesn't exist\n", port);
@@ -501,15 +502,15 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
 
         hub->non_rem_dev = USB251XB_DEF_NON_REMOVABLE_DEVICES;
         usb251xb_get_ports_field(hub, "non-removable-ports", data->port_cnt,
-                                 &hub->non_rem_dev);
+                                 true, &hub->non_rem_dev);
 
         hub->port_disable_sp = USB251XB_DEF_PORT_DISABLE_SELF;
         usb251xb_get_ports_field(hub, "sp-disabled-ports", data->port_cnt,
-                                 &hub->port_disable_sp);
+                                 true, &hub->port_disable_sp);
 
         hub->port_disable_bp = USB251XB_DEF_PORT_DISABLE_BUS;
         usb251xb_get_ports_field(hub, "bp-disabled-ports", data->port_cnt,
-                                 &hub->port_disable_bp);
+                                 true, &hub->port_disable_bp);
 
         hub->max_power_sp = USB251XB_DEF_MAX_POWER_SELF;
         if (!of_property_read_u32(np, "sp-max-total-current-microamp",
@@ -573,9 +574,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
          */
         hub->port_swap = USB251XB_DEF_PORT_SWAP;
         usb251xb_get_ports_field(hub, "swap-dx-lanes", data->port_cnt,
-                                 &hub->port_swap);
-        if (of_get_property(np, "swap-us-lanes", NULL))
-                hub->port_swap |= BIT(0);
+                                 false, &hub->port_swap);
 
         /* The following parameters are currently not exposed to devicetree, but
          * may be as soon as needed.