diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-04-01 04:02:28 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-04-01 04:02:28 -0800 |
| commit | 545cd8441635816752c1dcadb23c8b32a22eb0c8 (patch) | |
| tree | 32168831cd8c94302d675fe84dd14825c2a985e8 | |
| parent | a6fe8c0db4a95363d2f96adcb1d66075119a9057 (diff) | |
| download | history-545cd8441635816752c1dcadb23c8b32a22eb0c8.tar.gz | |
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 <gregkh@suse.de>
| -rw-r--r-- | drivers/pci/remove.c | 2 | ||||
| -rw-r--r-- | kernel/resource.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 8162960e6f1757..96f077f9a65940 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 78071fb10f9659..35c99ac02c7cf1 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; |