git.openwrt.org Git - openwrt/staging/dedeckeh.git/blob

   1 From 12c2e32f14da857b58af281b029d4549d24c3292 Mon Sep 17 00:00:00 2001
   2 From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
   3 Date: Tue, 12 Jul 2016 00:17:28 +0000
   4 Subject: [PATCH] net: ethernet: bgmac: Fix return value check in bgmac_probe()
   5
   6 In case of error, the function devm_ioremap_resource() returns ERR_PTR()
   7 and never returns NULL. The NULL test in the return value check should be
   8 replaced with IS_ERR().
   9
  10 Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
  11 Signed-off-by: David S. Miller <davem@davemloft.net>
  12 ---
  13  drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +-
  14  1 file changed, 1 insertion(+), 1 deletion(-)
  15
  16 --- a/drivers/net/ethernet/broadcom/bgmac-platform.c
  17 +++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
  18 @@ -141,7 +141,7 @@ static int bgmac_probe(struct platform_d
  19         }
  20
  21         bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs);
  22 -       if (!bgmac->plat.idm_base) {
  23 +       if (IS_ERR(bgmac->plat.idm_base)) {
  24                 dev_err(&pdev->dev, "Unable to map idm resource\n");
  25                 return PTR_ERR(bgmac->plat.idm_base);
  26         }