usb: usbip tool: Fix refresh_imported_device_list()

The commit 0775a9cbc694e8c7 ("usbip: vhci extension: modifications
to vhci driver") introduced multiple controllers, but the status
of the ports are only extracted from the first status file, fix it.

Reviewed-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Signed-off-by: Yuyang Du <yuyang.du@intel.com>
Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c
index f6f3a19ba385f9ef8347f6a5b91a2b935748b096..aa82c4b17797b2410d6d2d460a9a6f22ecd3e6b9 100644 (file)
--- a/tools/usb/usbip/libsrc/vhci_driver.c
+++ b/tools/usb/usbip/libsrc/vhci_driver.c
@@ -108,18 +108,33 @@ static int parse_status(const char *value)
        return 0;
 }
 
+#define MAX_STATUS_NAME 16
+
 static int refresh_imported_device_list(void)
 {
        const char *attr_status;
+       char status[MAX_STATUS_NAME+1] = "status";
+       int i, ret;
 
-       attr_status = udev_device_get_sysattr_value(vhci_driver->hc_device,
-                                              "status");
-       if (!attr_status) {
-               err("udev_device_get_sysattr_value failed");
-               return -1;
+       for (i = 0; i < vhci_driver->ncontrollers; i++) {
+               if (i > 0)
+                       snprintf(status, sizeof(status), "status.%d", i);
+
+               attr_status = udev_device_get_sysattr_value(vhci_driver->hc_device,
+                                                           status);
+               if (!attr_status) {
+                       err("udev_device_get_sysattr_value failed");
+                       return -1;
+               }
+
+               dbg("controller %d", i);
+
+               ret = parse_status(attr_status);
+               if (ret != 0)
+                       return ret;
        }
 
-       return parse_status(attr_status);
+       return 0;
 }
 
 static int get_nports(void)