Merge tag 'v3.10.71' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / usb / core / usb.c

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index b10da720f2b4d612385e778578a86b2562eb11ed..bd9b6d4a23dd5436ad2a2e993a131ab99019fe4a 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -270,11 +270,13 @@ static void usb_dev_complete(struct device *dev)
 
 static int usb_dev_suspend(struct device *dev)
 {
+       MYDBG("");      
        return usb_suspend(dev, PMSG_SUSPEND);
 }
 
 static int usb_dev_resume(struct device *dev)
 {
+       MYDBG("");      
        return usb_resume(dev, PMSG_RESUME);
 }
 
@@ -1003,6 +1005,7 @@ static int __init usb_init(void)
                pr_info("%s: USB support disabled\n", usbcore_name);
                return 0;
        }
+       usb_init_pool_max();
 
        retval = usb_debugfs_init();
        if (retval)