[PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe

Subsystems: mediatek ethernet driver, networking drivers, the rest

STALE3830d

4 messages, 4 authors, 2016-03-23 · open the first message on its own page

[PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe

From: vz@mleia.com (Vladimir Zapolskiy)
Date: 2016-03-22 23:06:04

devm_ioremap_resource() returns ERR_PTR() value on error, it never
returns NULL, fix it and propagate the returned error upwards.

Fixes: 656e705243fd ("net-next: mediatek: add support for MT7623 ethernet")
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
---
 drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 7f2126b..e0b68af 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1690,8 +1690,8 @@ static int mtk_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	eth->base = devm_ioremap_resource(&pdev->dev, res);
-	if (!eth->base)
-		return -EADDRNOTAVAIL;
+	if (IS_ERR(eth->base))
+		return PTR_ERR(eth->base);
 
 	spin_lock_init(&eth->page_lock);
 
-- 
2.1.4

[PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe

From: matthias.bgg@gmail.com (Matthias Brugger)
Date: 2016-03-23 09:00:50


On 23/03/16 00:06, Vladimir Zapolskiy wrote:
devm_ioremap_resource() returns ERR_PTR() value on error, it never
returns NULL, fix it and propagate the returned error upwards.

Fixes: 656e705243fd ("net-next: mediatek: add support for MT7623 ethernet")
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
---
Reviewed-by: Matthias Brugger <mbrugger@suse.com>
quoted hunk
  drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 7f2126b..e0b68af 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1690,8 +1690,8 @@ static int mtk_probe(struct platform_device *pdev)
  		return -ENOMEM;

  	eth->base = devm_ioremap_resource(&pdev->dev, res);
-	if (!eth->base)
-		return -EADDRNOTAVAIL;
+	if (IS_ERR(eth->base))
+		return PTR_ERR(eth->base);

  	spin_lock_init(&eth->page_lock);

[PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe

From: John Crispin <hidden>
Date: 2016-03-23 09:07:28


On 23/03/2016 10:00, Matthias Brugger wrote:

On 23/03/16 00:06, Vladimir Zapolskiy wrote:
quoted
devm_ioremap_resource() returns ERR_PTR() value on error, it never
returns NULL, fix it and propagate the returned error upwards.

Fixes: 656e705243fd ("net-next: mediatek: add support for MT7623
ethernet")
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
---
Reviewed-by: Matthias Brugger <mbrugger@suse.com>
Acked-by: John Crispin <redacted>

Thanks for the fix !

quoted
  drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 7f2126b..e0b68af 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1690,8 +1690,8 @@ static int mtk_probe(struct platform_device *pdev)
          return -ENOMEM;

      eth->base = devm_ioremap_resource(&pdev->dev, res);
-    if (!eth->base)
-        return -EADDRNOTAVAIL;
+    if (IS_ERR(eth->base))
+        return PTR_ERR(eth->base);

      spin_lock_init(&eth->page_lock);

[PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe

From: davem@davemloft.net (David Miller)
Date: 2016-03-23 17:50:15

From: Vladimir Zapolskiy <vz@mleia.com>
Date: Wed, 23 Mar 2016 01:06:04 +0200
devm_ioremap_resource() returns ERR_PTR() value on error, it never
returns NULL, fix it and propagate the returned error upwards.

Fixes: 656e705243fd ("net-next: mediatek: add support for MT7623 ethernet")
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Applied, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help