These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / tty / serial / icom.c

diff --git a/kernel/drivers/tty/serial/icom.c b/kernel/drivers/tty/serial/icom.c
index 45fc323..ffc7cb2 100644 (file)
--- a/kernel/drivers/tty/serial/icom.c
+++ b/kernel/drivers/tty/serial/icom.c
@@ -1504,7 +1504,8 @@ static int icom_probe(struct pci_dev *dev,
                return retval;
        }
 
-       if ( (retval = pci_request_regions(dev, "icom"))) {
+       retval = pci_request_regions(dev, "icom");
+       if (retval) {
                 dev_err(&dev->dev, "pci_request_regions FAILED\n");
                 pci_disable_device(dev);
                 return retval;
@@ -1512,7 +1513,8 @@ static int icom_probe(struct pci_dev *dev,
 
        pci_set_master(dev);
 
-       if ( (retval = pci_read_config_dword(dev, PCI_COMMAND, &command_reg))) {
+       retval = pci_read_config_dword(dev, PCI_COMMAND, &command_reg);
+       if (retval) {
                dev_err(&dev->dev, "PCI Config read FAILED\n");
                return retval;
        }
@@ -1556,9 +1558,8 @@ static int icom_probe(struct pci_dev *dev,
        }
 
         /* save off irq and request irq line */
-        if ( (retval = request_irq(dev->irq, icom_interrupt,
-                                  IRQF_SHARED, ICOM_DRIVER_NAME,
-                                  (void *) icom_adapter))) {
+        retval = request_irq(dev->irq, icom_interrupt, IRQF_SHARED, ICOM_DRIVER_NAME, (void *)icom_adapter);
+        if (retval) {
                  goto probe_exit2;
         }