summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/lib/libbsp/i386/pc386/ChangeLog4
-rw-r--r--c/src/lib/libbsp/i386/pc386/timer/timer.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index 9ebf52a3f7..64ca7977e6 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-21 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Do not do the indirect call if NULL.
+
2010-06-14 Joel Sherrill <joel.sherrilL@OARcorp.com>
* startup/bspstart.c: Formatting.
diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c
index ff3eb0040e..bddfe5303b 100644
--- a/c/src/lib/libbsp/i386/pc386/timer/timer.c
+++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c
@@ -251,7 +251,8 @@ uint32_t benchmark_timer_read(void)
void Timer_exit(void)
{
- return (*Timer_exit_function)();
+ if ( Timer_exit_function )
+ return (*Timer_exit_function)();
}
/*