From 0cd0fd0867005a0344d06c01fff8f8a66b3d2ecb Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 11 Nov 2011 17:14:15 +0100 Subject: [PATCH] usb-linux: fix /proc/bus/usb/devices scan Commit 0c402e5abb8c2755390eee864b43a98280fc2453 is incomplete and misses one of the two function pointer calls in usb_host_scan_dev(). Add the additional port handling logic to the other call too. Spotted by Coverity. Cc: Markus Armbruster Signed-off-by: Gerd Hoffmann --- usb-linux.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usb-linux.c b/usb-linux.c index f086d57edb..d4426ea730 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1568,7 +1568,12 @@ static int usb_host_scan_dev(void *opaque, USBScanFunc *func) if (line[0] == 'T' && line[1] == ':') { if (device_count && (vendor_id || product_id)) { /* New device. Add the previously discovered device. */ - ret = func(opaque, bus_num, addr, 0, class_id, vendor_id, + if (port > 0) { + snprintf(buf, sizeof(buf), "%d", port); + } else { + snprintf(buf, sizeof(buf), "?"); + } + ret = func(opaque, bus_num, addr, buf, class_id, vendor_id, product_id, product_name, speed); if (ret) { goto the_end; -- 2.11.4.GIT