]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
net: mediatek: fix checking for NULL instead of IS_ERR() in .probe
authorVladimir Zapolskiy <vz@mleia.com>
Tue, 22 Mar 2016 23:06:04 +0000 (01:06 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Mar 2016 17:49:13 +0000 (13:49 -0400)
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 <blogic@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mediatek/mtk_eth_soc.c

index 7f2126b6a179fa54888b7de0a469767b71692762..e0b68afea56e7695ed0de5122cc027c683aefb46 100644 (file)
@@ -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);