aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/remove.c2
-rw-r--r--kernel/resource.c1
2 files changed, 1 insertions, 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;