commit 754358aa80610b9d969a91b5cf96206b7a0b5153
author Badhri Jagan Sridharan <badhri@google.com> Tue Aug 12 21:05:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 12 21:05:43 2014 +0000
tree 60ce37ef352a7f8ed67ae1a3b78a8911e31d23c1
parent 165e4d220202ed386e5b7ebf3a6bde0d335eb227
parent 0d8943c252a21390c63a16ae0f9f1459c3212163

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

* commit '0d8943c252a21390c63a16ae0f9f1459c3212163':
  libusbhost: Fix IOCTL call during usb_request_cancel

libusbhost/usbhost.c

diff --git a/libusbhost/usbhost.c b/libusbhost/usbhost.c
index 488dd0e..684f401 100644
--- a/libusbhost/usbhost.c
+++ b/libusbhost/usbhost.c
@@ -695,6 +695,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);
 }