Merge branch 'sony' into release

[mv-sheeva.git] / drivers / usb / host / ehci-hub.c

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 1b6f1c0e5cee23c6c62f406c204a655d9b13fe67..2c6571c05f35c99398d973382680137f56363dcb 100644 (file)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -236,7 +236,7 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
        }
 
        if (unlikely(ehci->debug)) {
-               if (ehci->debug && !dbgp_reset_prep())
+               if (!dbgp_reset_prep())
                        ehci->debug = NULL;
                else
                        dbgp_external_startup();