2 files changed, 4 insertions, 6 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index db190226f0..61035b33f7 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -70,9 +70,8 @@ void backlight_thread(void)
                 DEBUGF("backlight_thread got SYS_USB_CONNECTED\n");
                 usb_acknowledge(SYS_USB_CONNECTED_ACK);
 
-                /* Wait until the system reboots */
-                while(1)
-                    yield();
+                /* Wait until the USB cable is extracted again */
+                usb_wait_for_disconnect(&backlight_queue);
                 break;
         }
     }
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 815de997d5..b27382750c 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -697,9 +697,8 @@ static void mpeg_thread(void)
                 DEBUGF("mpeg_thread got SYS_USB_CONNECTED\n");
                 usb_acknowledge(SYS_USB_CONNECTED_ACK);
 
-                /* Wait until the system reboots */
-                while(1)
-                    yield();
+                /* Wait until the USB cable is extracted again */
+                usb_wait_for_disconnect(&mpeg_queue);
                 break;
         }
     }