From 0ec216794f431a5f579d3af66b0700187f22469d Mon Sep 17 00:00:00 2001 From: Li Jun Date: Tue, 28 Apr 2015 19:56:35 +0800 Subject: [PATCH] MLK-10750 usb: chipidea: otg: remove otg fsm before destory gdaget and host If unload ci_hdrc driver while otg fsm is running as A-device, we should firstly clean otg fsm and stop all otg fsm timers before destroy gadget and host. Signed-off-by: Li Jun (cherry picked from commit 95b62fe02aee5d2a83a9eb60816ee7cfc16708e8) --- drivers/usb/chipidea/core.c | 4 ++-- drivers/usb/chipidea/otg_fsm.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 3c7831db95c3..3443d9b92195 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -864,10 +864,10 @@ EXPORT_SYMBOL_GPL(ci_hdrc_query_available_role); static inline void ci_role_destroy(struct ci_hdrc *ci) { - ci_hdrc_gadget_destroy(ci); - ci_hdrc_host_destroy(ci); if (ci->is_otg) ci_hdrc_otg_destroy(ci); + ci_hdrc_gadget_destroy(ci); + ci_hdrc_host_destroy(ci); } static void ci_get_otg_capable(struct ci_hdrc *ci) diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c index 63701d18cda5..e8486d524b13 100644 --- a/drivers/usb/chipidea/otg_fsm.c +++ b/drivers/usb/chipidea/otg_fsm.c @@ -865,6 +865,13 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci) void ci_hdrc_otg_fsm_remove(struct ci_hdrc *ci) { + enum otg_fsm_timer i; + + for (i = 0; i < NUM_OTG_FSM_TIMERS; i++) + otg_del_timer(&ci->fsm, i); + + ci->enabled_otg_timer_bits = 0; + /* Turn off vbus if vbus is on */ if (ci->fsm.a_vbus_vld) otg_drv_vbus(&ci->fsm, 0); -- 2.17.1