diff --git a/configs/olimex-lpc1766stk/src/lpc17_nsh.c b/configs/olimex-lpc1766stk/src/lpc17_nsh.c
index d17933c6117..cdd7bccfa29 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_nsh.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_nsh.c
@@ -141,25 +141,23 @@ static struct usbhost_connection_s *g_usbconn;
 #ifdef NSH_HAVEUSBHOST
 static int nsh_waiter(int argc, char *argv[])
 {
-  bool connected = false;
+  struct usbhost_hubport_s *hport;
 
   syslog(LOG_INFO, "nsh_waiter: Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
-      DEBUGVERIFY(CONN_WAIT(g_usbconn, &connected));
-
-      connected = !connected;
-      syslog(LOG_INFO, "%s\n", connected ? "connected" : "disconnected");
+      DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
+      syslog(LOG_INFO, "%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
-      if (connected)
+      if (hport->connected)
         {
           /* Yes.. enumerate the newly connected device */
 
-          (void)CONN_ENUMERATE(g_usbconn, 0);
+          (void)CONN_ENUMERATE(g_usbconn, hport);
         }
     }