diff options
| author | Nobuo Iwata <nobuo.iwata@fujixerox.co.jp> | 2016-03-22 08:31:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-03 23:32:07 +0200 |
| commit | e66fa8b08fbd87f375f964f1eaa1f5dfab9dc0c4 (patch) | |
| tree | 629abb3d33b384bcd484cb52c72937a43da7ee59 /tools | |
| parent | USB: EHCI: make all debugging depend on CONFIG_DYNAMIC_DEBUG (diff) | |
| download | linux-e66fa8b08fbd87f375f964f1eaa1f5dfab9dc0c4.tar.xz linux-e66fa8b08fbd87f375f964f1eaa1f5dfab9dc0c4.zip | |
usbip: adding names db to port operation
Adding names database to port command.
BEFORE) 'unknown' for vendor and product string.
Imported USB devices
====================
Port 00: <Port in Use> at Low Speed(1.5Mbps)
unknown vendor : unknown product (03f0:0224)
3-1 -> usbip://10.0.2.15:3240/5-1
-> remote bus/dev 005/002
AFTER) Most vendor string will be converted.
Imported USB devices
====================
Port 00: <Port in Use> at Low Speed(1.5Mbps)
Hewlett-Packard : unknown product (03f0:0224)
3-1 -> usbip://10.0.2.15:3240/5-1
-> remote bus/dev 005/002
Signed-off-by: Nobuo Iwata <nobuo.iwata@fujixerox.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/usb/usbip/src/usbip_port.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/usb/usbip/src/usbip_port.c b/tools/usb/usbip/src/usbip_port.c index a2e884fd9226..7bd74fb3a9cd 100644 --- a/tools/usb/usbip/src/usbip_port.c +++ b/tools/usb/usbip/src/usbip_port.c @@ -22,10 +22,13 @@ static int list_imported_devices(void) struct usbip_imported_device *idev; int ret; + if (usbip_names_init(USBIDS_FILE)) + err("failed to open %s", USBIDS_FILE); + ret = usbip_vhci_driver_open(); if (ret < 0) { err("open vhci_driver"); - return -1; + goto err_names_free; } printf("Imported USB devices\n"); @@ -35,13 +38,19 @@ static int list_imported_devices(void) idev = &vhci_driver->idev[i]; if (usbip_vhci_imported_device_dump(idev) < 0) - ret = -1; + goto err_driver_close; } usbip_vhci_driver_close(); + usbip_names_free(); return ret; +err_driver_close: + usbip_vhci_driver_close(); +err_names_free: + usbip_names_free(); + return -1; } int usbip_port_show(__attribute__((unused)) int argc, |