Merge branch 'pci/hotplug'

Browse source

- fix possible cpqphp NULL pointer dereference (Shawn Lin)

  - rescan more of the hierarchy on ACPI hotplug to fix Thunderbolt/xHCI
    hotplug (Mika Westerberg)

* pci/hotplug:
  ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status()
  PCI: cpqphp: Fix possible NULL pointer dereference

...

This commit is contained in:

Bjorn Helgaas 2018-04-04 13:27:42 -05:00 • committed by Bjorn Helgaas

parent 315271b0ff 13d3047c81

commit a5c6ad7840

2 changed files with 21 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

23

drivers/pci/hotplug/acpiphp_glue.c

View file

12

drivers/pci/hotplug/cpqphp_ctrl.c

View file