aboutsummaryrefslogtreecommitdiffstats
path: root/tools/usb
diff options
context:
space:
mode:
authorDu, ChangbinX2012-05-14 20:49:25 -0500
committerGreg Kroah-Hartman2012-05-15 10:41:13 -0500
commitf6fe916ed0a383ae89b041200dae271579c053b3 (patch)
tree6ac20853c560ced5fcb1d7ce0bd71d4444f4ccc1 /tools/usb
parent1996e6c572969a8cf6d7fa97eef621219acd94a9 (diff)
downloadkernel-omap-f6fe916ed0a383ae89b041200dae271579c053b3.tar.gz
kernel-omap-f6fe916ed0a383ae89b041200dae271579c053b3.tar.xz
kernel-omap-f6fe916ed0a383ae89b041200dae271579c053b3.zip
USB: testusb: add path /dev/bus/usb to default search paths for usbfs
As real device-nodes managed by udev whose nodes lived in /dev/bus/usb are mostly used today, let testusb tool use that directory as one default path make tool be more convenient to use. Signed-off-by: Du Changbin <changbinx.du@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/usb')
-rw-r--r--tools/usb/testusb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c
index 6e0f56701e44..82d7c590c026 100644
--- a/tools/usb/testusb.c
+++ b/tools/usb/testusb.c
@@ -358,6 +358,7 @@ static const char *usbfs_dir_find(void)
358{ 358{
359 static char usbfs_path_0[] = "/dev/usb/devices"; 359 static char usbfs_path_0[] = "/dev/usb/devices";
360 static char usbfs_path_1[] = "/proc/bus/usb/devices"; 360 static char usbfs_path_1[] = "/proc/bus/usb/devices";
361 static char udev_usb_path[] = "/dev/bus/usb";
361 362
362 static char *const usbfs_paths[] = { 363 static char *const usbfs_paths[] = {
363 usbfs_path_0, usbfs_path_1 364 usbfs_path_0, usbfs_path_1
@@ -376,6 +377,10 @@ static const char *usbfs_dir_find(void)
376 } 377 }
377 } while (++it != end); 378 } while (++it != end);
378 379
380 /* real device-nodes managed by udev */
381 if (access(udev_usb_path, F_OK) == 0)
382 return udev_usb_path;
383
379 return NULL; 384 return NULL;
380} 385}
381 386