Commit 812b074b authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by David S. Miller

drivers/net/irda/sh_irda.c: fix error return code

The function sh_irda_probe() return 0 for success and negative value
for most of its internal tests failures. There is one exception
that is error case going to err_mem_4:. For this error case, the
function abort its success execution path, but returns non negative
value, making it difficult for a caller function to notice the error.

This patch fixes the error case that do not return negative value.

This was found by Coccinelle, but the code change was made by hand.
This patch is not robot generated.

A simplified version of the semantic match that finds this problem is
as follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}
// </smpl>
Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd9d1160
...@@ -808,8 +808,8 @@ static int __devinit sh_irda_probe(struct platform_device *pdev) ...@@ -808,8 +808,8 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
goto err_mem_4; goto err_mem_4;
platform_set_drvdata(pdev, ndev); platform_set_drvdata(pdev, ndev);
err = request_irq(irq, sh_irda_irq, IRQF_DISABLED, "sh_irda", self);
if (request_irq(irq, sh_irda_irq, IRQF_DISABLED, "sh_irda", self)) { if (err) {
dev_warn(&pdev->dev, "Unable to attach sh_irda interrupt\n"); dev_warn(&pdev->dev, "Unable to attach sh_irda interrupt\n");
goto err_mem_4; goto err_mem_4;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment