From 9bc5adfb21fbad605fd72cb2a794940b301b540a Mon Sep 17 00:00:00 2001
From: Vincent Coubard <vincent.coubard@arm.com>
Date: Fri, 26 Aug 2016 15:39:55 +0100
Subject: [PATCH] Fix a rare case of imcompatibility between base_control_t and
 control_t.

Both branches of a ternary operator should yield the same type;
compatibility is not enough in that case.
---
 TESTS/storage_abstraction/basicAPI/basicAPI.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TESTS/storage_abstraction/basicAPI/basicAPI.cpp b/TESTS/storage_abstraction/basicAPI/basicAPI.cpp
index bc31905e3e..05fbe6d896 100644
--- a/TESTS/storage_abstraction/basicAPI/basicAPI.cpp
+++ b/TESTS/storage_abstraction/basicAPI/basicAPI.cpp
@@ -135,7 +135,7 @@ control_t test_initialize(const size_t call_count)
     TEST_ASSERT(rc >= ARM_DRIVER_OK);
     if (rc == ARM_DRIVER_OK) {
         TEST_ASSERT_EQUAL(1, capabilities.asynchronous_ops);
-        return (call_count < REPEAT_INSTANCES) ? (CaseTimeout(200) + CaseRepeatAll) : CaseNext;
+        return (call_count < REPEAT_INSTANCES) ? (CaseTimeout(200) + CaseRepeatAll) : (control_t) CaseNext;
     }
 
     TEST_ASSERT(rc == 1);