commit 0d8943c252a21390c63a16ae0f9f1459c3212163
author Badhri Jagan Sridharan <badhri@google.com> Tue Aug 12 20:59:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 12 20:59:20 2014 +0000
tree 468d32d634ab019a4855e4104284cc5722b27693
parent e4ec1e94ed38eab5c0fdb964182f8ea9b8939750
parent e4c5b6143b12925426a1af36ae0a201d18f93cad

am e4c5b614: Merge "libusbhost: Fix IOCTL call during usb_request_cancel"

* commit 'e4c5b6143b12925426a1af36ae0a201d18f93cad':
  libusbhost: Fix IOCTL call during usb_request_cancel

libusbhost/usbhost.c

diff --git a/libusbhost/usbhost.c b/libusbhost/usbhost.c
index cd8000a..a3222cf 100644
--- a/libusbhost/usbhost.c
+++ b/libusbhost/usbhost.c
@@ -690,6 +690,6 @@
 int usb_request_cancel(struct usb_request *req)
 {
     struct usbdevfs_urb *urb = ((struct usbdevfs_urb*)req->private_data);
-    return ioctl(req->dev->fd, USBDEVFS_DISCARDURB, &urb);
+    return ioctl(req->dev->fd, USBDEVFS_DISCARDURB, urb);
 }