From fc961745f5ff121e827702255872354f31f95547 Mon Sep 17 00:00:00 2001 From: Jakub Tyszkowski Date: Sat, 7 Mar 2015 18:42:16 +0100 Subject: [PATCH] Fix getting error message when successfully using stlinkV2 When using stlinkV2 you are constantly getting error messages from 'stlink_v1_open' when all goes well and 'stlink_open_usb' is used instead. This patch fixes this confusing behaviour and makes stlink-sg.c use logging macros consistently by removing last 'stderr' printout. It is not needed as 'stlink_v1_open_inner' is verbose enough. --- src/stlink-sg.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/stlink-sg.c b/src/stlink-sg.c index 960455b..db68e2f 100644 --- a/src/stlink-sg.c +++ b/src/stlink-sg.c @@ -1017,10 +1017,9 @@ stlink_t* stlink_v1_open_inner(const int verbose) { stlink_t* stlink_v1_open(const int verbose, int reset) { stlink_t *sl = stlink_v1_open_inner(verbose); - if (sl == NULL) { - fputs("Error: could not open stlink device\n", stderr); + if (sl == NULL) return NULL; - } + // by now, it _must_ be fully open and in a useful mode.... stlink_enter_swd_mode(sl); /* Now we are ready to read the parameters */ -- 2.47.2