Merge pull request #49 from UweBonnes/master

[fw/stlink] / src / stlink-usb.c

diff --git a/src/stlink-usb.c b/src/stlink-usb.c
index 4f8debc949528f178e295c8f8e15fe919f3ef3c9..65d92ecabb2bbebc19b5fd167ba9708edc411e5b 100644 (file)
--- a/src/stlink-usb.c
+++ b/src/stlink-usb.c
@@ -203,7 +203,7 @@ uint32_t _stlink_usb_read_debug32(stlink_t *sl, uint32_t addr) {
     size = send_recv(slu, 1, cmd, slu->cmd_len, rdata, rep_len);
     if (size == -1) {
         printf("[!] send_recv\n");
-        return;
+        return 0;
     }
     return read_uint32(rdata, 4);
 }
@@ -701,8 +701,9 @@ stlink_t* stlink_open_usb(const int verbose) {
       stlink_enter_swd_mode(sl);
     }
 
-    stlink_version(sl);
+    stlink_reset(sl);
     stlink_load_device_params(sl);
+    stlink_version(sl);
 
     error = 0;