commit 41099f4e7468d872857c52608dcc2a51bae68174
author danh-arm <dan.handley@arm.com> Wed Sep 30 15:18:15 2015 +0100
committer danh-arm <dan.handley@arm.com> Wed Sep 30 15:18:15 2015 +0100
tree db87e227a5d1c01aefbd3b2142c99cc121553769
parent 271b60df726a732abf056bb2ba62e70fc8500d5e
parent 543128771c59e9f1ee91c245d342e929d5ba7fa1

Merge pull request #401 from sandrine-bailleux/sb/fix-sp804-bug-v2

Bug fix in the SP804 dual timer driver

include/drivers/arm/sp804_delay_timer.h

diff --git a/include/drivers/arm/sp804_delay_timer.h b/include/drivers/arm/sp804_delay_timer.h
index 5a33571..1531e5a 100644
--- a/include/drivers/arm/sp804_delay_timer.h
+++ b/include/drivers/arm/sp804_delay_timer.h
@@ -40,8 +40,13 @@
 void sp804_timer_ops_init(uintptr_t base_addr, const timer_ops_t *ops);
 
 #define sp804_timer_init(base_addr, clk_mult, clk_div)			\
-	sp804_timer_ops_init((base_addr), &(const timer_ops_t)		\
-			{ sp804_get_timer_value, (clk_mult), (clk_div) })
-
+	do {								\
+		static const timer_ops_t sp804_timer_ops = {		\
+			sp804_get_timer_value,				\
+			(clk_mult),					\
+			(clk_div)					\
+		};							\
+		sp804_timer_ops_init((base_addr), &sp804_timer_ops);	\
+	} while (0)
 
 #endif /* __SP804_DELAY_TIMER_H__ */