usb: typec: tcpm: Error handling for tcpm_register_partner_altmodes
authorKyle Tso <kyletso@google.com>
Tue, 14 Jul 2020 03:34:53 +0000 (11:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Jul 2020 11:38:21 +0000 (13:38 +0200)
typec_partner_register_altmode returns ERR_PTR. Reset the pointer
altmode to NULL on failure.

Signed-off-by: Kyle Tso <kyletso@google.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20200714033453.4044482-3-kyletso@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/tcpm/tcpm.c

index 82b19eb..a6d4b03 100644 (file)
@@ -1061,9 +1061,11 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
        for (i = 0; i < modep->altmodes; i++) {
                altmode = typec_partner_register_altmode(port->partner,
                                                &modep->altmode_desc[i]);
-               if (!altmode)
+               if (IS_ERR(altmode)) {
                        tcpm_log(port, "Failed to register partner SVID 0x%04x",
                                 modep->altmode_desc[i].svid);
+                       altmode = NULL;
+               }
                port->partner_altmode[i] = altmode;
        }
 }