Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Nobuo Iwata and committed by
Greg Kroah-Hartman
e66fa8b0 128f8b3d

+11 -2
+11 -2
tools/usb/usbip/src/usbip_port.c
··· 22 22 struct usbip_imported_device *idev; 23 23 int ret; 24 24 25 + if (usbip_names_init(USBIDS_FILE)) 26 + err("failed to open %s", USBIDS_FILE); 27 + 25 28 ret = usbip_vhci_driver_open(); 26 29 if (ret < 0) { 27 30 err("open vhci_driver"); 28 - return -1; 31 + goto err_names_free; 29 32 } 30 33 31 34 printf("Imported USB devices\n"); ··· 38 35 idev = &vhci_driver->idev[i]; 39 36 40 37 if (usbip_vhci_imported_device_dump(idev) < 0) 41 - ret = -1; 38 + goto err_driver_close; 42 39 } 43 40 44 41 usbip_vhci_driver_close(); 42 + usbip_names_free(); 45 43 46 44 return ret; 47 45 46 + err_driver_close: 47 + usbip_vhci_driver_close(); 48 + err_names_free: 49 + usbip_names_free(); 50 + return -1; 48 51 } 49 52 50 53 int usbip_port_show(__attribute__((unused)) int argc,