From 0c8527f5c1406d94e882a6eb71c4cbc1bb0813aa Mon Sep 17 00:00:00 2001
From: Qinghao Shi <Qinghao.Shi@arm.com>
Date: Mon, 11 Jun 2018 12:01:49 +0100
Subject: [PATCH] add disable interrupt function in us_ticker_free()

---
 targets/TARGET_ARM_FM/TARGET_FVP_MPS2/us_ticker.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/us_ticker.c b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/us_ticker.c
index 14cae1ed8d..0b86dc90bb 100644
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/us_ticker.c
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/us_ticker.c
@@ -62,12 +62,9 @@ void us_ticker_init(void)
 
 void us_ticker_free(void)
 {
-    if (!us_ticker_inited) {
-        return;
-    }
-
     US_TICKER_TIMER1->TimerControl  &= ~CMSDK_DUALTIMER1_CTRL_EN_Msk; // disable TIMER1
     US_TICKER_TIMER2->TimerControl  &= ~CMSDK_DUALTIMER2_CTRL_EN_Msk; // disable TIMER2
+    us_ticker_disable_interrupt();
     us_ticker_inited = 0;
 }