| Message ID | 20200509030214.14435-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 360a10285e7e2722f6869f5dc8e81214a72b57f6 |
| Headers | show |
| Series | [-next] interconnect: imx: Fix return value check in imx_icc_node_init_qos() | expand |
> From: Wei Yongjun <weiyongjun1@huawei.com> > Sent: Saturday, May 9, 2020 11:02 AM > > In case of error, the function of_parse_phandle() returns NULL pointer not > ERR_PTR(). The IS_ERR() test in the return value check should be replaced with > NULL test. > > Fixes: f0d8048525d7 ("interconnect: Add imx core driver") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com> Regards Aisheng
On 2020-05-09 5:58 AM, Wei Yongjun wrote: > In case of error, the function of_parse_phandle() returns NULL pointer > not ERR_PTR(). The IS_ERR() test in the return value check should be > replaced with NULL test. > > Fixes: f0d8048525d7 ("interconnect: Add imx core driver") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/interconnect/imx/imx.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/interconnect/imx/imx.c b/drivers/interconnect/imx/imx.c > index 6884212511f0..ac420f86008e 100644 > --- a/drivers/interconnect/imx/imx.c > +++ b/drivers/interconnect/imx/imx.c > @@ -90,10 +90,10 @@ static int imx_icc_node_init_qos(struct icc_provider *provider, > node->name, node->id); > } else { > dn = of_parse_phandle(dev->of_node, adj->phandle_name, 0); > - if (IS_ERR(dn)) { > - dev_warn(dev, "Failed to parse %s: %ld\n", > - adj->phandle_name, PTR_ERR(dn)); > - return PTR_ERR(dn); > + if (!dn) { > + dev_warn(dev, "Failed to parse %s\n", > + adj->phandle_name); > + return -ENODEV; > } > /* Allow scaling to be disabled on a per-node basis */ > if (!dn || !of_device_is_available(dn)) { Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
diff --git a/drivers/interconnect/imx/imx.c b/drivers/interconnect/imx/imx.c index 6884212511f0..ac420f86008e 100644 --- a/drivers/interconnect/imx/imx.c +++ b/drivers/interconnect/imx/imx.c @@ -90,10 +90,10 @@ static int imx_icc_node_init_qos(struct icc_provider *provider, node->name, node->id); } else { dn = of_parse_phandle(dev->of_node, adj->phandle_name, 0); - if (IS_ERR(dn)) { - dev_warn(dev, "Failed to parse %s: %ld\n", - adj->phandle_name, PTR_ERR(dn)); - return PTR_ERR(dn); + if (!dn) { + dev_warn(dev, "Failed to parse %s\n", + adj->phandle_name); + return -ENODEV; } /* Allow scaling to be disabled on a per-node basis */ if (!dn || !of_device_is_available(dn)) {
In case of error, the function of_parse_phandle() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: f0d8048525d7 ("interconnect: Add imx core driver") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/interconnect/imx/imx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)