Skip to content

Commit

Permalink
serial: icom: fix error return code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Julia Lawall authored and Greg Kroah-Hartman committed Nov 26, 2014
1 parent f0c1e46 commit ddcbad9
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/tty/serial/icom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1550,8 +1550,10 @@ static int icom_probe(struct pci_dev *dev,

icom_adapter->base_addr = pci_ioremap_bar(dev, 0);

if (!icom_adapter->base_addr)
if (!icom_adapter->base_addr) {
retval = -ENOMEM;
goto probe_exit1;
}

/* save off irq and request irq line */
if ( (retval = request_irq(dev->irq, icom_interrupt,
Expand Down

0 comments on commit ddcbad9

Please sign in to comment.