From dc127f213c9b7e60f649bc236602e4f28285c53b Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Fri, 2 Jan 2015 22:15:31 +0100 Subject: Clarify usb_powered() and fix some code. Either by mistake or because its meaning changed, usb_powered() doesn't mean what the name suggest, so clarify its meaning by renaming it to usb_powered_only. So use of usb_powered() are replaced by usb_inserted() when it makes more sense. Change-Id: I112887e2d8560e84587bee5f55c826dde8c806d8 Reviewed-on: http://gerrit.rockbox.org/1097 Reviewed-by: Amaury Pouly --- apps/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'apps/main.c') diff --git a/apps/main.c b/apps/main.c index 60164515fa..211f7f1b3c 100644 --- a/apps/main.c +++ b/apps/main.c @@ -586,7 +586,8 @@ static void init(void) mounted = true; /* mounting done @ end of USB mode */ } #ifdef HAVE_USB_POWER - if (usb_powered()) /* avoid deadlock */ + /* if there is no host or user requested no USB, skip this */ + if (usb_powered_only()) break; #endif } -- cgit v1.2.3