diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-11-20 12:33:59 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-25 20:06:39 -0500 |
commit | ddcbad929510bcad640693fe3cf299632823f61c (patch) | |
tree | b76348557a01b4867f2d3937319aebccef24e820 /drivers/tty | |
parent | f0c1e460452138df03cb7a7f0e7546b74950b783 (diff) |
serial: icom: fix error return code
Return a negative 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/icom.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index d4620fe5da2e..45fc323b95e6 100644 --- a/drivers/tty/serial/icom.c +++ b/drivers/tty/serial/icom.c | |||
@@ -1550,8 +1550,10 @@ static int icom_probe(struct pci_dev *dev, | |||
1550 | 1550 | ||
1551 | icom_adapter->base_addr = pci_ioremap_bar(dev, 0); | 1551 | icom_adapter->base_addr = pci_ioremap_bar(dev, 0); |
1552 | 1552 | ||
1553 | if (!icom_adapter->base_addr) | 1553 | if (!icom_adapter->base_addr) { |
1554 | retval = -ENOMEM; | ||
1554 | goto probe_exit1; | 1555 | goto probe_exit1; |
1556 | } | ||
1555 | 1557 | ||
1556 | /* save off irq and request irq line */ | 1558 | /* save off irq and request irq line */ |
1557 | if ( (retval = request_irq(dev->irq, icom_interrupt, | 1559 | if ( (retval = request_irq(dev->irq, icom_interrupt, |