Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

The function sh_sir_probe() return 0 for success and negative value
for most of its internal tests failures. There are two exceptions
that are error cases going to err_mem_*:. For this two cases, the
function abort its success execution path, but returns non negative
value, making it dificult for a caller function to notice the error.

This patch fixes the error cases that do not return negative values.

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: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Peter Senna Tschudin and committed by
David S. Miller
14834540 812b074b

+3 -2
+3 -2
drivers/net/irda/sh_sir.c
··· 741 741 self->clk = clk_get(&pdev->dev, clk_name); 742 742 if (IS_ERR(self->clk)) { 743 743 dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name); 744 + err = -ENODEV; 744 745 goto err_mem_3; 745 746 } 746 747 ··· 761 760 goto err_mem_4; 762 761 763 762 platform_set_drvdata(pdev, ndev); 764 - 765 - if (request_irq(irq, sh_sir_irq, IRQF_DISABLED, "sh_sir", self)) { 763 + err = request_irq(irq, sh_sir_irq, IRQF_DISABLED, "sh_sir", self); 764 + if (err) { 766 765 dev_warn(&pdev->dev, "Unable to attach sh_sir interrupt\n"); 767 766 goto err_mem_4; 768 767 }