diff --git a/[refs] b/[refs] index 9e68f985c758..bbe5f676bcd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a1745fc54e22e9fa928d72f97ee0e91449c9fd0 +refs/heads/master: bfc978fa5f3005e5dfb39c52393c3339f4f00233 diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c index 8d2d62ff1a37..f1f7acfbf412 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/qlcnic/qlcnic_main.c @@ -2695,9 +2695,14 @@ static int qlcnic_is_first_func(struct pci_dev *pdev) oth_pdev = pci_get_domain_bus_and_slot(pci_domain_nr (pdev->bus), pdev->bus->number, PCI_DEVFN(PCI_SLOT(pdev->devfn), val)); + if (!oth_pdev) + continue; - if (oth_pdev && (oth_pdev->current_state != PCI_D3cold)) + if (oth_pdev->current_state != PCI_D3cold) { + pci_dev_put(oth_pdev); return 0; + } + pci_dev_put(oth_pdev); } return 1; }