2017-04-25 03:15:06

by Wei Yongjun

Subject: [PATCH -next] phy: qcom-qmp: fix return value check in qcom_qmp_phy_create()

From: Wei Yongjun <[email protected]>

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

Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/phy/phy-qcom-qmp.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/phy/phy-qcom-qmp.c b/drivers/phy/phy-qcom-qmp.c
index 727e23b..a25c29d 100644
--- a/drivers/phy/phy-qcom-qmp.c
+++ b/drivers/phy/phy-qcom-qmp.c
@@ -983,16 +983,16 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)
* Resources are indexed as: tx -> 0; rx -> 1; pcs -> 2.
*/
qphy->tx = of_iomap(np, 0);
- if (IS_ERR(qphy->tx))
- return PTR_ERR(qphy->tx);
+ if (!qphy->tx)
+ return -ENOMEM;

qphy->rx = of_iomap(np, 1);
- if (IS_ERR(qphy->rx))
- return PTR_ERR(qphy->rx);
+ if (!qphy->rx)
+ return -ENOMEM;

qphy->pcs = of_iomap(np, 2);
- if (IS_ERR(qphy->pcs))
- return PTR_ERR(qphy->pcs);
+ if (!qphy->pcs)
+ return -ENOMEM;

/*
* Get PHY's Pipe clock, if any. USB3 and PCIe are PIPE3

2017-04-25 04:22:07

by Vivek Gautam

Subject: Re: [PATCH -next] phy: qcom-qmp: fix return value check in qcom_qmp_phy_create()

On 04/25/2017 08:44 AM, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> In case of error, the function of_iomap() returns NULL pointer
> not ERR_PTR(). The IS_ERR() test in the return value check should
> be replaced with NULL test.
>
> Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
> Signed-off-by: Wei Yongjun <[email protected]>

Reviewed-by: Vivek Gautam <[email protected]>

> ---
> drivers/phy/phy-qcom-qmp.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/phy/phy-qcom-qmp.c b/drivers/phy/phy-qcom-qmp.c
> index 727e23b..a25c29d 100644
> --- a/drivers/phy/phy-qcom-qmp.c
> +++ b/drivers/phy/phy-qcom-qmp.c
> @@ -983,16 +983,16 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)
> * Resources are indexed as: tx -> 0; rx -> 1; pcs -> 2.
> */
> qphy->tx = of_iomap(np, 0);
> - if (IS_ERR(qphy->tx))
> - return PTR_ERR(qphy->tx);
> + if (!qphy->tx)
> + return -ENOMEM;
>
> qphy->rx = of_iomap(np, 1);
> - if (IS_ERR(qphy->rx))
> - return PTR_ERR(qphy->rx);
> + if (!qphy->rx)
> + return -ENOMEM;
>
> qphy->pcs = of_iomap(np, 2);
> - if (IS_ERR(qphy->pcs))
> - return PTR_ERR(qphy->pcs);
> + if (!qphy->pcs)
> + return -ENOMEM;
>
> /*
> * Get PHY's Pipe clock, if any. USB3 and PCIe are PIPE3
>

--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project