Commit 0dad3510 authored Sep 12, 2006 by Satoru Takeuchi Committed by Greg Kroah-Hartman Sep 26, 2006

acpiphp: stop bus device before acpi_bus_trim



Contrary to PCI bridge hot-add, we need to follow the sequence below
for PCI bridge hot-removal.

  (1) Stop devices (detach drivers, remove from the global list, etc.)
  (2) Unbind ACPI node from the devices (remove the _PRT entries)
  (3) Remove devices (remove from the device list, etc.)

This patch fixes acpiphp driver to follow above sequence for P2P
bridge hot-removal.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 24f8aa9b

drivers/pci/hotplug/acpiphp_glue.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1129,6 +1129,9 @@ static int disable_device(struct acpiphp_slot *slot)
		func->bridge = NULL;
		}

		if (func->pci_dev)
		pci_stop_bus_device(func->pci_dev);

		acpiphp_bus_trim(func->handle);
		/* try to remove anyway.
		* acpiphp_bus_add might have been failed */