Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3a4c916 authored by Li Jun's avatar Li Jun Committed by Greg Kroah-Hartman
Browse files

staging: typec: tcpci: use IS_ERR() instead of PTR_ERR_OR_ZERO() 



As tcpm_register_port() and tcpci_register_port() never return
NULL and NULL is not a success in this case, use IS_ERR() to check
the return value of both.

Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarLi Jun <jun.li@nxp.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c2ee5e18

drivers/staging/typec/tcpci.c

+2 −2
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) 
		return ERR_PTR(err);



	tcpci->port = tcpm_register_port(tcpci->dev, &tcpci->tcpc);

	if (PTR_ERR_OR_ZERO(tcpci->port))

	if (IS_ERR(tcpci->port))

		return ERR_CAST(tcpci->port);



	return tcpci;
@@ -551,7 +551,7 @@ static int tcpci_probe(struct i2c_client *client, 
		return err;



	chip->tcpci = tcpci_register_port(&client->dev, &chip->data);

	if (PTR_ERR_OR_ZERO(chip->tcpci))

	if (IS_ERR(chip->tcpci))

		return PTR_ERR(chip->tcpci);



	i2c_set_clientdata(client, chip);