diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2017-01-31 21:00:51 +0100 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2017-02-05 22:38:26 +0100 |
commit | f61044a9b0f37cfee8b2ce0d205403115b7e0107 (patch) | |
tree | af4704a0eee1a275804b49860293c839a7f1d4f0 /target/linux/generic/patches-4.4/071-v4.8-0006-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch | |
parent | 36288db2fd857643cd9c4437322614d8f14e4b69 (diff) | |
download | upstream-f61044a9b0f37cfee8b2ce0d205403115b7e0107.tar.gz upstream-f61044a9b0f37cfee8b2ce0d205403115b7e0107.tar.bz2 upstream-f61044a9b0f37cfee8b2ce0d205403115b7e0107.zip |
kernel: rename bgmac patches to squeeze them
This is a pure rename without any changes. It makes maintaining bgmac
simpler and will hopefully make adding new kernel a bit easier.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/071-v4.8-0006-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch')
-rw-r--r-- | target/linux/generic/patches-4.4/071-v4.8-0006-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch | 26 |
1 files changed, 26 insertions, 0 deletions
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); + } |