From 7264df388616d2fa21d4cb97336e7e2afe3759ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 17 Aug 2016 12:54:49 +0200 Subject: kernel: bgmac: backport 3 remaining small fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes bgmac in sync with upstream verison. Signed-off-by: Rafał Miłecki --- ...t-bgmac-Fix-return-value-check-in-bgmac_p.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 target/linux/generic/patches-4.4/076-0001-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch (limited to 'target/linux/generic/patches-4.4/076-0001-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch') diff --git a/target/linux/generic/patches-4.4/076-0001-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch b/target/linux/generic/patches-4.4/076-0001-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch new file mode 100644 index 0000000..e0431c1 --- /dev/null +++ b/target/linux/generic/patches-4.4/076-0001-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 +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 +Signed-off-by: David S. Miller +--- + 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); + } -- cgit v1.1