diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-24 09:17:46 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-24 09:17:46 -0800 |
| commit | 1f2a657df7fd3d0a55c9820bd16a6fe16339bc01 (patch) | |
| tree | ed7c6751acd7f23f5b5a68726e7f60829b001218 | |
| parent | 1dce1769c917763023a00ca2d66ff6d50ed0962b (diff) | |
| download | patches-1f2a657df7fd3d0a55c9820bd16a6fe16339bc01.tar.gz | |
another pci patch
| -rw-r--r-- | pci/acpiphp-fix-bridge-handle.patch | 35 | ||||
| -rw-r--r-- | series | 2 |
2 files changed, 37 insertions, 0 deletions
diff --git a/pci/acpiphp-fix-bridge-handle.patch b/pci/acpiphp-fix-bridge-handle.patch new file mode 100644 index 00000000000000..53df0624b10641 --- /dev/null +++ b/pci/acpiphp-fix-bridge-handle.patch @@ -0,0 +1,35 @@ +From muneda.takahiro@jp.fujitsu.com Fri Feb 24 09:08:13 2006 +Date: Fri, 24 Feb 2006 17:46:04 +0900 +Message-ID: <878xs1ywj7.wl%muneda.takahiro@jp.fujitsu.com> +From: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com> +To: <greg@kroah.com>, <kristen.c.accardi@intel.com> +Subject: acpiphp: fix bridge handle +Cc: <muneda.takahiro@jp.fujitsu.com>, <len.brown@intel.com> + +When hotplug slot is under the host bridge, +DEVICE_ACPI_HANDLE(&bus->self->dev) fails since '&bus->self' was not set. +This patch fixes it. + +This patch is based on kristen's latest patches. +I tested this patch on my Tiger4. + +Signed-off-by: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/pci/hotplug/acpiphp_glue.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- gregkh-2.6.orig/drivers/pci/hotplug/acpiphp_glue.c ++++ gregkh-2.6/drivers/pci/hotplug/acpiphp_glue.c +@@ -972,8 +972,8 @@ static int enable_device(struct acpiphp_ + acpiphp_sanitize_bus(bus); + pci_enable_bridges(bus); + pci_bus_add_devices(bus); +- acpiphp_set_hpp_values(DEVICE_ACPI_HANDLE(&bus->self->dev), bus); +- acpiphp_configure_ioapics(DEVICE_ACPI_HANDLE(&bus->self->dev)); ++ acpiphp_set_hpp_values(slot->bridge->handle, bus); ++ acpiphp_configure_ioapics(slot->bridge->handle); + + /* associate pci_dev to our representation */ + list_for_each (l, &slot->funcs) { @@ -162,6 +162,7 @@ pci/acpi-export-acpi_bus_trim.patch pci/acpiphp-add-dock-event-handling.patch pci/acpi-remove-dock-event-handling-from-ibm_acpi.patch pci/acpiphp-slot-management-fix-v4.patch +pci/acpiphp-fix-bridge-handle.patch # usb patches queued for 2.6.16 (bugfixes, new ids, etc.) @@ -283,3 +284,4 @@ usb/usb-initdata-fixes.patch usb/usbfs2.patch + |