summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-08-11 11:29:40 -0400
committerMike Lockwood <lockwood@android.com>2009-08-11 11:29:40 -0400
commitd70dc73d8d17a24a2a6dcdaa38f31dce47dd92aa (patch)
tree8b83799fce9a73ca3b563636cbb491f3c7cd20b3 /adb
parent37d3111b1c1ce61c3d9b10ed3ccaed9e5fad1e06 (diff)
downloadsystem_core-d70dc73d8d17a24a2a6dcdaa38f31dce47dd92aa.zip
system_core-d70dc73d8d17a24a2a6dcdaa38f31dce47dd92aa.tar.gz
system_core-d70dc73d8d17a24a2a6dcdaa38f31dce47dd92aa.tar.bz2
adb: Fix infinite loop in Linux host device discovery.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'adb')
-rw-r--r--adb/usb_linux.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/adb/usb_linux.c b/adb/usb_linux.c
index cf78d80..863af1d 100644
--- a/adb/usb_linux.c
+++ b/adb/usb_linux.c
@@ -269,11 +269,7 @@ static void find_usb_device(const char *base,
break;
} else {
// seek next interface descriptor
- if (i < interfaces - 1) {
- while (bufptr[1] != USB_DT_INTERFACE) {
- bufptr += bufptr[0];
- }
- }
+ bufptr += (USB_DT_ENDPOINT_SIZE * interface->bNumEndpoints);
}
} // end of for