drivers/misc: Move misplaced pci_dev_put's

Move pci_dev_put outside the loops in which it occurs.  Within the loop,
pci_dev_put is done implicitly by pci_get_device.

The problem was detected using the following semantic patch, and corrected
by hand.

@@
expression dev;
expression E;
@@

- pci_dev_put(dev)
   ... when != dev = E
- pci_get_device(...,dev)

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c
index 6a5a05d1f392..05172d2613d6 100644
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -244,10 +244,11 @@ ioc4_variant(struct ioc4_driver_data *idd)
                     idd->idd_pdev->bus->number == pdev->bus->number &&
                     3 == PCI_SLOT(pdev->devfn))
                         found = 1;
-                pci_dev_put(pdev);
         } while (pdev && !found);
-        if (NULL != pdev)
+        if (NULL != pdev) {
+                pci_dev_put(pdev);
                 return IOC4_VARIANT_IO9;
+        }
 
         /* IO10: Look for a Vitesse VSC 7174 at the same bus and slot 3. */
         pdev = NULL;
@@ -258,10 +259,11 @@ ioc4_variant(struct ioc4_driver_data *idd)
                     idd->idd_pdev->bus->number == pdev->bus->number &&
                     3 == PCI_SLOT(pdev->devfn))
                         found = 1;
-                pci_dev_put(pdev);
         } while (pdev && !found);
-        if (NULL != pdev)
+        if (NULL != pdev) {
+                pci_dev_put(pdev);
                 return IOC4_VARIANT_IO10;
+        }
 
         /* PCI-RT: No SCSI/SATA controller will be present */
         return IOC4_VARIANT_PCI_RT;