summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-07-01 10:14:40 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-07-01 10:14:40 +0200
commit12657cb99e1ca670da6a7cace3b238a42003e629 (patch)
treeb3f9c2ffb80e29ef78d79c71b52efe055371c66a /commands
parent55e87e07c1c788726423ac617545590cf36c0402 (diff)
parent706a47fa9c54056d53a42436b9762833756b971b (diff)
downloadbarebox-12657cb99e1ca670da6a7cace3b238a42003e629.tar.gz
barebox-12657cb99e1ca670da6a7cace3b238a42003e629.tar.xz
Merge branch 'for-next/usb'
Diffstat (limited to 'commands')
-rw-r--r--commands/usb.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/commands/usb.c b/commands/usb.c
index e5030659b4..9aee4308da 100644
--- a/commands/usb.c
+++ b/commands/usb.c
@@ -22,24 +22,20 @@
#include <usb/usb.h>
#include <getopt.h>
-static int scanned;
-
static int do_usb(int argc, char *argv[])
{
int opt;
+ int force = 0;
while ((opt = getopt(argc, argv, "f")) > 0) {
switch (opt) {
case 'f':
- scanned = 0;
+ force = 1;
break;
}
}
- if (!scanned) {
- usb_rescan();
- scanned = 1;
- }
+ usb_rescan(force);
return 0;
}