diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
| commit | 24b1c251dfcd02877c40d7e52288c9bc2dc7ff35 (patch) | |
| tree | 8fb3d4332168686f601f58b23815910799b1699f /0007-icom.c-move-assignment-out-of-if-block.patch | |
| parent | 71c7e32cd1509d46be836ed19dfe63e217eae8d4 (diff) | |
| download | patches-24b1c251dfcd02877c40d7e52288c9bc2dc7ff35.tar.gz | |
updates and new patches
Diffstat (limited to '0007-icom.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0007-icom.c-move-assignment-out-of-if-block.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/0007-icom.c-move-assignment-out-of-if-block.patch b/0007-icom.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..7cfb77a8e8ea87 --- /dev/null +++ b/0007-icom.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,55 @@ +From 1f917aadd8a9092baf8f9112951e27334764af1f Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:06 +0200 +Subject: [PATCH 07/36] 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> +--- + drivers/tty/serial/icom.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c +index 45fc323b95e6..ffc7cb2585a6 100644 +--- a/drivers/tty/serial/icom.c ++++ b/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; + } + +-- +2.3.7 + |