summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/flash/at91sam3.c1
-rw-r--r--src/helper/membuf.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index 449bcae7..70377ad8 100644
--- a/src/flash/at91sam3.c
+++ b/src/flash/at91sam3.c
@@ -2385,6 +2385,7 @@ sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **a
if (0 == strcmp("show", argv[0])) {
if (who == -1) {
showall:
+ r = ERROR_OK;
for (x = 0 ; x < pChip->details.n_gpnvms ; x++) {
r = FLASHD_GetGPNVM(&(pChip->details.bank[0]), x, &v);
if (r != ERROR_OK) {
diff --git a/src/helper/membuf.c b/src/helper/membuf.c
index 4e25d81a..160d0bd7 100644
--- a/src/helper/membuf.c
+++ b/src/helper/membuf.c
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <stdarg.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include "membuf.h"