]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: cdns3: Error out if USB_DR_MODE_UNKNOWN in cdns3_core_init_role()
authorRoger Quadros <rogerq@ti.com>
Thu, 17 Oct 2019 07:58:01 +0000 (10:58 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Oct 2019 19:00:15 +0000 (12:00 -0700)
USB_DR_MODE_UNKNOWN should be treated as error as it is done in
cdns3_drd_update_mode().

Fixes: 02ffc26df96b ("usb: cdns3: fix cdns3_core_init_role()")
Signed-off-by: Roger Quadros <rogerq@ti.com>
Link: https://lore.kernel.org/r/20191017075801.8734-1-rogerq@ti.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/cdns3/core.c

index 1109dc5a4c39a959848a9bc2c0ac2552fda87da8..c2123ef8d8a3320f11f1fa3b7b0363dc3886cd86 100644 (file)
@@ -166,7 +166,6 @@ static int cdns3_core_init_role(struct cdns3 *cdns)
                goto err;
 
        switch (cdns->dr_mode) {
-       case USB_DR_MODE_UNKNOWN:
        case USB_DR_MODE_OTG:
                ret = cdns3_hw_role_switch(cdns);
                if (ret)
@@ -182,6 +181,9 @@ static int cdns3_core_init_role(struct cdns3 *cdns)
                if (ret)
                        goto err;
                break;
+       default:
+               ret = -EINVAL;
+               goto err;
        }
 
        return ret;