mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
873b4f1892
commit
01e51df546
1 changed files with 6 additions and 5 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue