| From 1842d5f959041703f28e2518fa8a062d83e2546a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 8 Mar 2021 09:48:39 +0000 |
| Subject: usb: typec: stusb160x: fix return value check in stusb160x_probe() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| [ Upstream commit f2d90e07b5df2c7745ae66d2d48cc350d3f1c7d2 ] |
| |
| 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: da0cb6310094 ("usb: typec: add support for STUSB160x Type-C controller family") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
| Reviewed-by: Amelie Delaunay <amelie.delaunay@foss.st.com> |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Link: https://lore.kernel.org/r/20210308094839.3586773-1-weiyongjun1@huawei.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/usb/typec/stusb160x.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/usb/typec/stusb160x.c b/drivers/usb/typec/stusb160x.c |
| index d21750bbbb44..6eaeba9b096e 100644 |
| --- a/drivers/usb/typec/stusb160x.c |
| +++ b/drivers/usb/typec/stusb160x.c |
| @@ -682,8 +682,8 @@ static int stusb160x_probe(struct i2c_client *client) |
| } |
| |
| fwnode = device_get_named_child_node(chip->dev, "connector"); |
| - if (IS_ERR(fwnode)) |
| - return PTR_ERR(fwnode); |
| + if (!fwnode) |
| + return -ENODEV; |
| |
| /* |
| * When both VDD and VSYS power supplies are present, the low power |
| -- |
| 2.30.2 |
| |
