diff options
| author |   Julia Lawall <julia.lawall@lip6.fr> | 2015-08-23 02:11:14 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-25 13:37:31 -0700 |
| commit | 1ef53ebfa9ff5b205604fc781868765e00ae875f (patch) | |
| tree | c5b2a2a8b83f702e974f7b1d0d4f2fa28cadb4d1 /drivers/net/ethernet/ti/davinci_emac.c | |
| parent | Merge branch 'rds-assorted-bug-fixes' (diff) | |
| download | linux-dev-1ef53ebfa9ff5b205604fc781868765e00ae875f.tar.xz linux-dev-1ef53ebfa9ff5b205604fc781868765e00ae875f.zip | |
net: davinci_emac: fix error return code
Propagate error code on failure.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/davinci_emac.c')
| -rw-r--r-- | drivers/net/ethernet/ti/davinci_emac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index aeebc0a7bf47..a21c77bc1b27 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -2004,8 +2004,10 @@ static int davinci_emac_probe(struct platform_device *pdev) if (res_ctrl) { priv->ctrl_base = devm_ioremap_resource(&pdev->dev, res_ctrl); - if (IS_ERR(priv->ctrl_base)) + if (IS_ERR(priv->ctrl_base)) { + rc = PTR_ERR(priv->ctrl_base); goto no_pdata; + } } else { priv->ctrl_base = priv->remap_addr + pdata->ctrl_mod_reg_offset; } |