Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 01:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] PCI Hotplug: SN: Fix cleanup on hotplug removal of PPB

Browse Source 
When doing a hotplug removal of a PPB, sn_bus_store_sysdata()
needs to be called for the PPB and all of its children.

Acked-by: Prarit Bhargava <prarit@sgi.com>
Signed-off-by: John Keller <jpk@sgi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
John Keller 2006-03-08 13:21:34 -06:00 committed by Greg Kroah-Hartman
parent 0afabe9065
commit 8e77af6a9a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pci/hotplug/sgi_hotplug.c
View File

@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
* *
* Copyright (C) 2005 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 2005-2006 Silicon Graphics, Inc. All rights reserved.
* *
* This work was based on the 2.4/2.6 kernel development by Dick Reigner. * This work was based on the 2.4/2.6 kernel development by Dick Reigner.
* Work to add BIOS PROM support was completed by Mike Habeck. * Work to add BIOS PROM support was completed by Mike Habeck.
@ -230,6 +230,13 @@ static void sn_bus_free_data(struct pci_dev *dev)
list_for_each_entry(child, &subordinate_bus->devices, bus_list) list_for_each_entry(child, &subordinate_bus->devices, bus_list)
sn_bus_free_data(child); sn_bus_free_data(child);
} }
/*
* Some drivers may use dma accesses during the
* driver remove function. We release the sysdata
* areas after the driver remove functions have
* been called.
*/
sn_bus_store_sysdata(dev);
sn_pci_unfixup_slot(dev); sn_pci_unfixup_slot(dev);
} }
@ -429,13 +436,6 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
PCI_DEVFN(slot->device_num + 1, PCI_DEVFN(slot->device_num + 1,
PCI_FUNC(func))); PCI_FUNC(func)));
if (dev) { if (dev) {
/*
* Some drivers may use dma accesses during the
* driver remove function. We release the sysdata
* areas after the driver remove functions have
* been called.
*/
sn_bus_store_sysdata(dev);
sn_bus_free_data(dev); sn_bus_free_data(dev);
pci_remove_bus_device(dev); pci_remove_bus_device(dev);
pci_dev_put(dev); pci_dev_put(dev);