From 545cd8441635816752c1dcadb23c8b32a22eb0c8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 1 Apr 2005 04:02:28 -0800 Subject: PCI: revert dumb SGI patch for resource freeing. Cset exclude: gregkh@suse.de|ChangeSet|20050317183046|30063 The patch doesn't do anything, and I'm not going to be trusting any more SGI pci hotplug patches for a long time... Signed-off-by: Greg Kroah-Hartman --- drivers/pci/remove.c | 2 +- kernel/resource.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 8162960e6f175..96f077f9a6594 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -11,7 +11,7 @@ static void pci_free_resources(struct pci_dev *dev) pci_cleanup_rom(dev); for (i = 0; i < PCI_NUM_RESOURCES; i++) { struct resource *res = dev->resource + i; - if (res && res->parent) + if (res->parent) release_resource(res); } } diff --git a/kernel/resource.c b/kernel/resource.c index 78071fb10f965..35c99ac02c7cf 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -505,7 +505,6 @@ void __release_region(struct resource *parent, unsigned long start, unsigned lon *p = res->sibling; write_unlock(&resource_lock); kfree(res); - res = NULL; return; } p = &res->sibling; -- cgit 1.2.3-korg