]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: typec: tps6598x: Fix return value check in tps6598x_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Mon, 8 Mar 2021 09:48:41 +0000 (09:48 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:49:37 +0000 (10:49 +0200)
[ Upstream commit 604c75893a01c8a3b5bd6dac55535963cd44c3f5 ]

In case of error, the function device_get_named_child_node() returns
NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Fixes: 18a6c866bb19 ("usb: typec: tps6598x: Add USB role switching logic")
Reported-by: Hulk Robot <hulkci@huawei.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20210308094841.3587751-1-weiyongjun1@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/typec/tps6598x.c

index 29bd1c5a283cd966bec7bebdd294fbc5a52f66e6..4038104568f5a092727deb79ddd5c3c0a48454f9 100644 (file)
@@ -614,8 +614,8 @@ static int tps6598x_probe(struct i2c_client *client)
                return ret;
 
        fwnode = device_get_named_child_node(&client->dev, "connector");
-       if (IS_ERR(fwnode))
-               return PTR_ERR(fwnode);
+       if (!fwnode)
+               return -ENODEV;
 
        tps->role_sw = fwnode_usb_role_switch_get(fwnode);
        if (IS_ERR(tps->role_sw)) {