Commit 1ef53ebf authored Aug 23, 2015 by Julia Lawall Committed by David S. Miller Aug 25, 2015

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>

parent 96fd26b9

drivers/net/ethernet/ti/davinci_emac.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}