diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-08 14:25:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-08 14:25:45 +0100 |
| commit | 14ddde78c787248ada9da2f2d04900548ffcf342 (patch) | |
| tree | 9ba43a7a6ce68ee3aeff714c3056ebfd934f2cfd /drivers/net/ethernet/moxa/moxart_ether.c | |
| parent | 58122bf1d856a4ea9581d62a07c557d997d46a19 (diff) | |
| parent | e2857b8f11a289ed2b61d18d0665e05c1053c446 (diff) | |
| download | linux-14ddde78c787248ada9da2f2d04900548ffcf342.tar.bz2 | |
Merge branch 'linus' into x86/fpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/moxa/moxart_ether.c')
| -rw-r--r-- | drivers/net/ethernet/moxa/moxart_ether.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 00cfd95ca59d..3e67f451f2ab 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -474,9 +474,9 @@ static int moxart_mac_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ndev->base_addr = res->start; priv->base = devm_ioremap_resource(p_dev, res); - ret = IS_ERR(priv->base); - if (ret) { + if (IS_ERR(priv->base)) { dev_err(p_dev, "devm_ioremap_resource failed\n"); + ret = PTR_ERR(priv->base); goto init_fail; } |