1 files changed, 15 insertions, 6 deletions

diff --git a/firmware/usb.c b/firmware/usb.c
index 2ac56a9c15..fa7eef40d2 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -361,14 +361,9 @@ static void usb_thread(void)
                     break;
                 }
 
-                exclusive_storage_access = false;
 #endif /* HAVE_USBSTACK */
+                num_acks_to_expect = usb_release_exclusive_storage();
 
-                /* Tell all threads that we are back in business */
-                num_acks_to_expect =
-                    queue_broadcast(SYS_USB_DISCONNECTED, 0) - 1;
-                DEBUGF("USB extracted. Waiting for ack from %d threads...\n",
-                       num_acks_to_expect);
                 break;
 
             case SYS_USB_DISCONNECTED_ACK:
@@ -657,6 +652,20 @@ bool usb_exclusive_storage(void)
 }
 #endif
 
+int usb_release_exclusive_storage(void)
+{
+    int num_acks_to_expect;
+#ifdef HAVE_USBSTACK
+    exclusive_storage_access = false;
+#endif /* HAVE_USBSTACK */
+    /* Tell all threads that we are back in business */
+    num_acks_to_expect =
+        queue_broadcast(SYS_USB_DISCONNECTED, 0) - 1;
+    DEBUGF("USB extracted. Waiting for ack from %d threads...\n",
+           num_acks_to_expect);
+    return num_acks_to_expect;
+}
+
 #ifdef HAVE_USB_POWER
 bool usb_powered(void)
 {