am 3754791d: Merge "libusbhost: Fix issue of multiple inotify event at same time."

* commit '3754791dd5415c2e99d3bfd6599d414a202cbfc3':
  libusbhost: Fix issue of multiple inotify event at same time.
This commit is contained in:
JP Abgrall 2014-05-01 23:09:17 +00:00 committed by Android Git Automerger
commit cae898acba

View file

@ -263,11 +263,12 @@ int usb_host_read_event(struct usb_host_context *context)
D("%s subdirectory %s: index: %d\n", (event->mask & IN_CREATE) ?
"new" : "gone", path, i);
if (i > 0 && i < MAX_USBFS_WD_COUNT) {
int local_ret = 0;
if (event->mask & IN_CREATE) {
ret = inotify_add_watch(context->fd, path,
local_ret = inotify_add_watch(context->fd, path,
IN_CREATE | IN_DELETE);
if (ret >= 0)
context->wds[i] = ret;
if (local_ret >= 0)
context->wds[i] = local_ret;
done = find_existing_devices_bus(path, context->cb_added,
context->data);
} else if (event->mask & IN_DELETE) {