ChangeSet 1.2224.6.2, 2005/04/01 20:02:28-08:00, [EMAIL PROTECTED]

        PCI: revert dumb SGI patch for resource freeing.
        
        Cset exclude: [EMAIL PROTECTED]|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 <[EMAIL PROTECTED]>



 drivers/pci/remove.c |    2 +-
 kernel/resource.c    |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)


diff -Nru a/drivers/pci/remove.c b/drivers/pci/remove.c
--- a/drivers/pci/remove.c      2005-04-03 21:22:49 -07:00
+++ b/drivers/pci/remove.c      2005-04-03 21:22:49 -07:00
@@ -11,7 +11,7 @@
        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 -Nru a/kernel/resource.c b/kernel/resource.c
--- a/kernel/resource.c 2005-04-03 21:22:49 -07:00
+++ b/kernel/resource.c 2005-04-03 21:22:49 -07:00
@@ -505,7 +505,6 @@
                        *p = res->sibling;
                        write_unlock(&resource_lock);
                        kfree(res);
-                       res = NULL;
                        return;
                }
                p = &res->sibling;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to