From 215dad9984b98240a0fdd984d5b211e42198f5d3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 23 Apr 2015 07:13:31 -0600 Subject: [PATCH] Fix USB host polling; fix a typo in LPC17 HCD --- arch/arm/src/lpc17xx/lpc17_usbhost.c | 2 +- configs/olimex-lpc1766stk/src/lpc17_nsh.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c index be149d3aa1..02bb5947c8 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -1776,7 +1776,7 @@ static int lpc17_rh_enumerate(struct usbhost_connection_s *conn, struct usbhost_hubport_s *hport) { struct lpc17_usbhost_s *priv = (struct lpc17_usbhost_s *)&g_usbhost; - DEBUGASSERT(conn != NULL && hport != NULL &&& hport->port == 0); + DEBUGASSERT(conn != NULL && hport != NULL && hport->port == 0); /* Are we connected to a device? The caller should have called the wait() * method first to be assured that a device is connected. diff --git a/configs/olimex-lpc1766stk/src/lpc17_nsh.c b/configs/olimex-lpc1766stk/src/lpc17_nsh.c index cdd7bccfa2..721d3382b5 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_nsh.c +++ b/configs/olimex-lpc1766stk/src/lpc17_nsh.c @@ -1,7 +1,7 @@ /**************************************************************************** * config/olimex-lpc1766stk/src/lpc17_nsh.c * - * Copyright (C) 2010, 2013-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2013-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -149,7 +149,7 @@ static int nsh_waiter(int argc, char *argv[]) /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - syslog(LOG_INFO, "%s\n", hport->connected ? "connected" : "disconnected"); + syslog(LOG_INFO, "nsh_waiter: %s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */