Commit df115861 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/reset' 

- Fix locking issue in the slot reset path (Ilpo Järvinen)

* pci/reset:
  PCI: Fix lock symmetry in pci_slot_unlock()
parents 4dac48e8 f3efb956

drivers/pci/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -5524,6 +5524,7 @@ static void pci_slot_unlock(struct pci_slot *slot) 
			continue;

		if (dev->subordinate)

			pci_bus_unlock(dev->subordinate);

		else

			pci_dev_unlock(dev);

	}

}