Commit 01e51df5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

tty: icom.c: move assignment out of if () block

We should not be doing assignments within an if () block
so fix up the code to not do this.

change was created using Coccinelle.

CC: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 873b4f18
...@@ -1504,7 +1504,8 @@ static int icom_probe(struct pci_dev *dev, ...@@ -1504,7 +1504,8 @@ static int icom_probe(struct pci_dev *dev,
return retval; 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"); dev_err(&dev->dev, "pci_request_regions FAILED\n");
pci_disable_device(dev); pci_disable_device(dev);
return retval; return retval;
...@@ -1512,7 +1513,8 @@ static int icom_probe(struct pci_dev *dev, ...@@ -1512,7 +1513,8 @@ static int icom_probe(struct pci_dev *dev,
pci_set_master(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"); dev_err(&dev->dev, "PCI Config read FAILED\n");
return retval; return retval;
} }
...@@ -1556,9 +1558,8 @@ static int icom_probe(struct pci_dev *dev, ...@@ -1556,9 +1558,8 @@ static int icom_probe(struct pci_dev *dev,
} }
/* save off irq and request irq line */ /* save off irq and request irq line */
if ( (retval = request_irq(dev->irq, icom_interrupt, retval = request_irq(dev->irq, icom_interrupt, IRQF_SHARED, ICOM_DRIVER_NAME, (void *)icom_adapter);
IRQF_SHARED, ICOM_DRIVER_NAME, if (retval) {
(void *) icom_adapter))) {
goto probe_exit2; goto probe_exit2;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment