serial: icom: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Thu, 20 Nov 2014 17:33:59 +0000 (18:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Nov 2014 01:06:39 +0000 (17:06 -0800)
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>
drivers/tty/serial/icom.c

index d4620fe..45fc323 100644 (file)
@@ -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,