X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-4.4%2F071-v4.8-0006-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch;fp=target%2Flinux%2Fgeneric%2Fpatches-4.4%2F071-v4.8-0006-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch;h=e0431c12355f75140041dde06474293b87dde381;hb=7583de2e8fdc2fdcfb16dfd431590a4b4611bf52;hp=0000000000000000000000000000000000000000;hpb=4d10030c3ce822bc4e95aa134a5c61a7c34bc13f;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/target/linux/generic/patches-4.4/071-v4.8-0006-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch b/target/linux/generic/patches-4.4/071-v4.8-0006-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch
new file mode 100644
index 0000000000..e0431c1235
--- /dev/null
+++ b/target/linux/generic/patches-4.4/071-v4.8-0006-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch
@@ -0,0 +1,26 @@
+From 12c2e32f14da857b58af281b029d4549d24c3292 Mon Sep 17 00:00:00 2001
+From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
+Date: Tue, 12 Jul 2016 00:17:28 +0000
+Subject: [PATCH] net: ethernet: bgmac: Fix return value check in bgmac_probe()
+
+In case of error, the function devm_ioremap_resource() returns ERR_PTR()
+and never returns NULL. The NULL test in the return value check should be
+replaced with IS_ERR().
+
+Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
++++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
+@@ -141,7 +141,7 @@ static int bgmac_probe(struct platform_d
+ 	}
+ 
+ 	bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs);
+-	if (!bgmac->plat.idm_base) {
++	if (IS_ERR(bgmac->plat.idm_base)) {
+ 		dev_err(&pdev->dev, "Unable to map idm resource\n");
+ 		return PTR_ERR(bgmac->plat.idm_base);
+ 	}