summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Chi <mchi@nvidia.com>2014-01-28 10:58:38 +0800
committerMartin Chi <mchi@nvidia.com>2014-01-31 18:19:16 -0800
commit2bb0e43403ff31467f3f3ba883165a8b859b602f (patch)
treeb503780c8056dd89771c11341811c25abdf0957c
parentee36ef529ed5f41752e472eb591ce9f133cc42f9 (diff)
icera: acm: remove pm qos request in disconection
remove pm qos request when acm disconects, otherwise, pm_qos_add_request() will be called again as it's already added, and then cause some kernel warning bug 1448534 Change-Id: I16d0cd823132ac79cc03bd1fc53d12114d6ceb0e Signed-off-by: Martin Chi <mchi@nvidia.com> Reviewed-on: http://git-master/r/360679 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit
-rw-r--r--drivers/usb/class/cdc-acm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 8dd9d94e26a7..501d848847ca 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1553,6 +1553,12 @@ static void acm_disconnect(struct usb_interface *intf)
if (!acm)
return;
+#if defined(CONFIG_ICERA_MDM_LOGGING_BOOST_CPU_FREQ) && \
+ defined(CONFIG_TEGRA_USB_MODEM_POWER)
+ if (acm->minor == MODEM_LOG_PORT)
+ pm_qos_remove_request(&boost_cpu_freq_req);
+#endif
+
mutex_lock(&acm->mutex);
acm->disconnected = true;
if (acm->country_codes) {