Message ID | 20230725125319.565733-1-yangyingliang@huawei.com (mailing list archive) |
---|---|
State | Accepted |
Commit | da6d91ed77062960107e2eddacd932abecfd0592 |
Headers | show |
Series | usb: typec: qcom: fix return value check in qcom_pmic_typec_probe() | expand |
On 25.07.2023 14:53, Yang Yingliang wrote: > device_get_named_child_node() returns NULL, if it fails, replace > IS_ERR() with NULL pointer check. > > Fixes: a4422ff22142 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad
On 7/25/23 05:53, Yang Yingliang wrote: > device_get_named_child_node() returns NULL, if it fails, replace > IS_ERR() with NULL pointer check. > > Fixes: a4422ff22142 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c > index a905160dd860..9b467a346114 100644 > --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c > +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c > @@ -209,8 +209,8 @@ static int qcom_pmic_typec_probe(struct platform_device *pdev) > platform_set_drvdata(pdev, tcpm); > > tcpm->tcpc.fwnode = device_get_named_child_node(tcpm->dev, "connector"); > - if (IS_ERR(tcpm->tcpc.fwnode)) > - return PTR_ERR(tcpm->tcpc.fwnode); > + if (!tcpm->tcpc.fwnode) > + return -EINVAL; > > tcpm->tcpm_port = tcpm_register_port(tcpm->dev, &tcpm->tcpc); > if (IS_ERR(tcpm->tcpm_port)) {
On 25/07/2023 13:53, Yang Yingliang wrote: > device_get_named_child_node() returns NULL, if it fails, replace > IS_ERR() with NULL pointer check. > > Fixes: a4422ff22142 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c > index a905160dd860..9b467a346114 100644 > --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c > +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c > @@ -209,8 +209,8 @@ static int qcom_pmic_typec_probe(struct platform_device *pdev) > platform_set_drvdata(pdev, tcpm); > > tcpm->tcpc.fwnode = device_get_named_child_node(tcpm->dev, "connector"); > - if (IS_ERR(tcpm->tcpc.fwnode)) > - return PTR_ERR(tcpm->tcpc.fwnode); > + if (!tcpm->tcpc.fwnode) > + return -EINVAL; > > tcpm->tcpm_port = tcpm_register_port(tcpm->dev, &tcpm->tcpc); > if (IS_ERR(tcpm->tcpm_port)) { Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c index a905160dd860..9b467a346114 100644 --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c @@ -209,8 +209,8 @@ static int qcom_pmic_typec_probe(struct platform_device *pdev) platform_set_drvdata(pdev, tcpm); tcpm->tcpc.fwnode = device_get_named_child_node(tcpm->dev, "connector"); - if (IS_ERR(tcpm->tcpc.fwnode)) - return PTR_ERR(tcpm->tcpc.fwnode); + if (!tcpm->tcpc.fwnode) + return -EINVAL; tcpm->tcpm_port = tcpm_register_port(tcpm->dev, &tcpm->tcpc); if (IS_ERR(tcpm->tcpm_port)) {
device_get_named_child_node() returns NULL, if it fails, replace IS_ERR() with NULL pointer check. Fixes: a4422ff22142 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)