@@ -2975,9 +2975,13 @@ static int btusb_probe(struct usb_interface *intf,
}
if (id->driver_info & BTUSB_MARVELL) {
+ struct pci_dev *pdev;
hdev->set_bdaddr = btusb_set_bdaddr_marvell;
- if (pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, 0x1028, 0x0720, NULL) ||
- pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, 0x1028, 0x0733, NULL)) {
+ pdev = pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, 0x1028, 0x0720, NULL);
+ if (!pdev)
+ pdev = pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, 0x1028, 0x0733, NULL);
+ if (pdev) {
+ pci_dev_put(pdev);
hdev->post_open = btusb_edge_post_open;
hdev->shutdown = btusb_edge_shutdown;
}