Automatic merge of /spare/repo/netdev-2.6 branch skge

[linux-2.6] / drivers / usb / host / uhci-hcd.c

diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 98745a072d6fe69afa5134b33aa8aab6d70f94bb..49bd83ee0c75bd77eded16e1fa3d02484f2d784a 100644 (file)
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -890,8 +890,7 @@ up_failed:
        debugfs_remove(uhci_debugfs_root);
 
 debug_failed:
-       if (errbuf)
-               kfree(errbuf);
+       kfree(errbuf);
 
 errbuf_failed:
 
@@ -906,9 +905,7 @@ static void __exit uhci_hcd_cleanup(void)
                warn("not all urb_priv's were freed!");
 
        debugfs_remove(uhci_debugfs_root);
-
-       if (errbuf)
-               kfree(errbuf);
+       kfree(errbuf);
 }
 
 module_init(uhci_hcd_init);