Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 73691
b: refs/heads/master
c: 90d8dab
h: refs/heads/master
i:
  73689: 4bfec51
  73687: d68e689
v: v3
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Nov 15, 2007
1 parent 2b61d33 commit b8d2fc4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e62aa046e1748b8ea0354951685478030392cf56
refs/heads/master: 90d8dabf74179e6615bd4688a118e12ec29ab7aa
10 changes: 6 additions & 4 deletions trunk/drivers/misc/ioc4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit b8d2fc4

Please sign in to comment.