* [PATCH net-next] net: dsa: gswip: Fix copy-paste error in gswip_gphy_fw_probe()
@ 2018-09-15 1:33 Wei Yongjun
2018-09-15 9:14 ` Hauke Mehrtens
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2018-09-15 1:33 UTC (permalink / raw)
To: Andrew Lunn, Vivien Didelot, Florian Fainelli, Hauke Mehrtens
Cc: Wei Yongjun, netdev, kernel-janitors
The return value from of_reset_control_array_get_exclusive() is not
checked correctly. The test is done against a wrong variable. This
patch fix it.
Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/net/dsa/lantiq_gswip.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
index 9c28d0b..9c10570 100644
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -934,10 +934,10 @@ static int gswip_gphy_fw_probe(struct gswip_priv *priv,
}
gphy_fw->reset = of_reset_control_array_get_exclusive(gphy_fw_np);
- if (IS_ERR(priv->gphy_fw)) {
- if (PTR_ERR(priv->gphy_fw) != -EPROBE_DEFER)
+ if (IS_ERR(gphy_fw->reset)) {
+ if (PTR_ERR(gphy_fw->reset) != -EPROBE_DEFER)
dev_err(dev, "Failed to lookup gphy reset\n");
- return PTR_ERR(priv->gphy_fw);
+ return PTR_ERR(gphy_fw->reset);
}
return gswip_gphy_fw_load(priv, gphy_fw);
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net-next] net: dsa: gswip: Fix copy-paste error in gswip_gphy_fw_probe()
2018-09-15 1:33 [PATCH net-next] net: dsa: gswip: Fix copy-paste error in gswip_gphy_fw_probe() Wei Yongjun
@ 2018-09-15 9:14 ` Hauke Mehrtens
0 siblings, 0 replies; 2+ messages in thread
From: Hauke Mehrtens @ 2018-09-15 9:14 UTC (permalink / raw)
To: Wei Yongjun, Andrew Lunn, Vivien Didelot, Florian Fainelli
Cc: netdev, kernel-janitors
[-- Attachment #1.1: Type: text/plain, Size: 1223 bytes --]
On 09/15/2018 03:33 AM, Wei Yongjun wrote:
> The return value from of_reset_control_array_get_exclusive() is not
> checked correctly. The test is done against a wrong variable. This
> patch fix it.
>
> Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> drivers/net/dsa/lantiq_gswip.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
> index 9c28d0b..9c10570 100644
> --- a/drivers/net/dsa/lantiq_gswip.c
> +++ b/drivers/net/dsa/lantiq_gswip.c
> @@ -934,10 +934,10 @@ static int gswip_gphy_fw_probe(struct gswip_priv *priv,
> }
>
> gphy_fw->reset = of_reset_control_array_get_exclusive(gphy_fw_np);
> - if (IS_ERR(priv->gphy_fw)) {
> - if (PTR_ERR(priv->gphy_fw) != -EPROBE_DEFER)
> + if (IS_ERR(gphy_fw->reset)) {
> + if (PTR_ERR(gphy_fw->reset) != -EPROBE_DEFER)
> dev_err(dev, "Failed to lookup gphy reset\n");
> - return PTR_ERR(priv->gphy_fw);
> + return PTR_ERR(gphy_fw->reset);
> }
>
> return gswip_gphy_fw_load(priv, gphy_fw);
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-15 14:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-15 1:33 [PATCH net-next] net: dsa: gswip: Fix copy-paste error in gswip_gphy_fw_probe() Wei Yongjun
2018-09-15 9:14 ` Hauke Mehrtens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox