Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc_otg_310 / dwc_otg_cil_intr.c

diff --git a/drivers/usb/dwc_otg_310/dwc_otg_cil_intr.c b/drivers/usb/dwc_otg_310/dwc_otg_cil_intr.c
index a4327dc176f821a26260b7e88206330134de9f27..78bf20d2a1af52da0d857505e28ca5d2b7f7f716 100755 (executable)
--- a/drivers/usb/dwc_otg_310/dwc_otg_cil_intr.c
+++ b/drivers/usb/dwc_otg_310/dwc_otg_cil_intr.c
@@ -109,8 +109,8 @@ int32_t dwc_otg_handle_otg_intr(dwc_otg_core_if_t *core_if)
                                dctl.d32);
                dwc_otg_disable_global_interrupts(core_if);
                core_if->otg_dev->pcd->vbus_status = USB_BC_TYPE_DISCNT;
-               DWC_PRINTF
-                   ("********session end ,soft disconnect************************\n");
+
+               DWC_PRINTF("********session end ,soft disconnect***********\n");
 
                gotgctl.d32 = DWC_READ_REG32(&global_regs->gotgctl);
 
@@ -405,8 +405,8 @@ int32_t dwc_otg_handle_conn_id_status_change_intr(dwc_otg_core_if_t *core_if)
         * Release lock before scheduling workq as it holds spinlock during scheduling
         */
 
-       DWC_WORKQ_SCHEDULE(core_if->wq_otg, w_conn_id_status_change,
-                          core_if, "connection id status change");
+       /*DWC_WORKQ_SCHEDULE(core_if->wq_otg, w_conn_id_status_change,
+                          core_if, "connection id status change");*/
        DWC_SPINLOCK(core_if->lock);
 out:
        /* Set flag and clear interrupt */