usb: typec: Start using ERR_PTR

[linux.git] / drivers / usb / typec / tcpm.c

diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index a163ba55b061970541a5cf3512ea5d07ec2a4bd1..cd48a99ee9131290ba72febc9b8187e5f2a21a6b 100644 (file)
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -1033,7 +1033,7 @@ static int tcpm_pd_svdm(struct tcpm_port *port, const __le32 *payload, int cnt,
                break;
        case CMDT_RSP_ACK:
                /* silently drop message if we are not connected */
-               if (!port->partner)
+               if (IS_ERR_OR_NULL(port->partner))
                        break;
 
                switch (cmd) {
@@ -3732,8 +3732,8 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
        port->port_type = tcpc->config->type;
 
        port->typec_port = typec_register_port(port->dev, &port->typec_caps);
-       if (!port->typec_port) {
-               err = -ENOMEM;
+       if (IS_ERR(port->typec_port)) {
+               err = PTR_ERR(port->typec_port);
                goto out_destroy_wq;
        }
 
@@ -3742,15 +3742,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
 
                i = 0;
                while (paltmode->svid && i < ARRAY_SIZE(port->port_altmode)) {
-                       port->port_altmode[i] =
-                         typec_port_register_altmode(port->typec_port,
-                                                     paltmode);
-                       if (!port->port_altmode[i]) {
+                       struct typec_altmode *alt;
+
+                       alt = typec_port_register_altmode(port->typec_port,
+                                                         paltmode);
+                       if (IS_ERR(alt)) {
                                tcpm_log(port,
                                         "%s: failed to register port alternate mode 0x%x",
                                         dev_name(dev), paltmode->svid);
                                break;
                        }
+                       port->port_altmode[i] = alt;
                        i++;
                        paltmode++;
                }