071-v4.8-0006-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch 1.0 KB

1234567891011121314151617181920212223242526
  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. In case of error, the function devm_ioremap_resource() returns ERR_PTR()
  6. and never returns NULL. The NULL test in the return value check should be
  7. replaced with IS_ERR().
  8. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
  9. Signed-off-by: David S. Miller <davem@davemloft.net>
  10. ---
  11. drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +-
  12. 1 file changed, 1 insertion(+), 1 deletion(-)
  13. --- a/drivers/net/ethernet/broadcom/bgmac-platform.c
  14. +++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
  15. @@ -141,7 +141,7 @@ static int bgmac_probe(struct platform_d
  16. }
  17. bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs);
  18. - if (!bgmac->plat.idm_base) {
  19. + if (IS_ERR(bgmac->plat.idm_base)) {
  20. dev_err(&pdev->dev, "Unable to map idm resource\n");
  21. return PTR_ERR(bgmac->plat.idm_base);
  22. }