On Tue, Mar 22, 2016 at 04:31:03PM +0900, Nobuo Iwata wrote:
> 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@xxxxxxxxxxxxxxx>
> ---
> tools/usb/usbip/src/usbip_port.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/tools/usb/usbip/src/usbip_port.c b/tools/usb/usbip/src/usbip_port.c
> index a2e884fd..7bd74fb 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,
Does nothing need to be changed in the usbip code to add this new
feature? Is this a stand-alone patch I can take without anything else?
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
