Merge tag 'keys-next-fixes-20150114' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / icom.c

diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index d4620fe5da2e43a264b08adbee8111dd12bef2cc..45fc323b95e62781efc94961c0fa7efb646a29ba 100644 (file)
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -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,