summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-07-20 16:31:42 -0400
committerMike Lockwood <lockwood@android.com>2010-07-20 16:31:42 -0400
commite8849d190a3097274dcb64416e564538a1017054 (patch)
tree0a7b96f123d8b852394b7b5e7cfe4f1acd0c5575
parent72f3a00cc7b9a53120a4fb38a3d374d6d692618d (diff)
downloadsystem_core-e8849d190a3097274dcb64416e564538a1017054.zip
system_core-e8849d190a3097274dcb64416e564538a1017054.tar.gz
system_core-e8849d190a3097274dcb64416e564538a1017054.tar.bz2
libusbhost: Fix deadlock on devices without USB host support.
Change-Id: Ic91f99d1169fcdc00474dd6a870eb7e614128bc2 Signed-off-by: Mike Lockwood <lockwood@android.com>
-rw-r--r--libusbhost/usbhost.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libusbhost/usbhost.c b/libusbhost/usbhost.c
index f5ec140..06d91f5 100644
--- a/libusbhost/usbhost.c
+++ b/libusbhost/usbhost.c
@@ -162,6 +162,8 @@ void usb_host_run(struct usb_host_context *context,
wds[0] = inotify_add_watch(context->fd, USB_FS_DIR, IN_CREATE | IN_DELETE);
if (wds[0] < 0) {
fprintf(stderr, "inotify_add_watch failed\n");
+ if (discovery_done_cb)
+ discovery_done_cb(client_data);
return;
}