tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'pci-v3.18-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
"This fixes an oops when enabling SR-IOV VF devices. The oops is a
regression I added by configuring all devices during enumeration.

- Don't oops on virtual buses in acpi_pci_get_bridge_handle() (Yinghai Lu)"

* tag 'pci-v3.18-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Don't oops on virtual buses in acpi_pci_get_bridge_handle()

Linus Torvalds ed78bb84 3d5a0863

+6 -1
+6 -1
include/linux/pci-acpi.h
··· 41 41 42 42 if (pci_is_root_bus(pbus)) 43 43 dev = pbus->bridge; 44 - else 44 + else { 45 + /* If pbus is a virtual bus, there is no bridge to it */ 46 + if (!pbus->self) 47 + return NULL; 48 + 45 49 dev = &pbus->self->dev; 50 + } 46 51 47 52 return ACPI_HANDLE(dev); 48 53 }