diff --git a/drivers/platform/msm/mhi/mhi_macros.h b/drivers/platform/msm/mhi/mhi_macros.h
index fc0e6f4bc27d..04ecf13991b3 100644
--- a/drivers/platform/msm/mhi/mhi_macros.h
+++ b/drivers/platform/msm/mhi/mhi_macros.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -45,7 +45,7 @@
 #define MHI_PCIE_DEVICE_ID_ZIRC 0x0301
 #define MHI_PCIE_DEVICE_ID_9x55 0x0302
 
-#define MHI_M2_DEBOUNCE_TMR_MS 10
+#define MHI_M2_DEBOUNCE_TMR_US 10000
 
 #define MHI_EV_DB_INTERVAL 1
 
diff --git a/drivers/platform/msm/mhi/mhi_states.c b/drivers/platform/msm/mhi/mhi_states.c
index e38355841c22..2906393cbd5c 100644
--- a/drivers/platform/msm/mhi/mhi_states.c
+++ b/drivers/platform/msm/mhi/mhi_states.c
@@ -430,7 +430,7 @@ void process_m1_transition(struct work_struct *work)
 	mhi_set_m_state(mhi_dev_ctxt, MHI_STATE_M2);
 	write_unlock_irq(&mhi_dev_ctxt->pm_xfer_lock);
 
-	msleep(MHI_M2_DEBOUNCE_TMR_MS);
+	usleep_range(MHI_M2_DEBOUNCE_TMR_US, MHI_M2_DEBOUNCE_TMR_US + 50);
 	write_lock_irq(&mhi_dev_ctxt->pm_xfer_lock);
 
 	/* During DEBOUNCE Time We could be receiving M0 Event */