summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBadhri Jagan Sridharan <badhri@google.com>2014-08-12 20:56:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-12 20:02:46 +0000
commit0be19a53cf9532a5e071e640cb3af5946bfc3d6f (patch)
tree178fc418d505aec7ec6c48b07e9d44fac4a071a3
parenta639b97d4ac9f22b64fd4aa8d5ac24177817a0dc (diff)
parent266685924a81eb6a6c82f8e04cbe1ad5ffbff491 (diff)
downloadsystem_core-0be19a53cf9532a5e071e640cb3af5946bfc3d6f.zip
system_core-0be19a53cf9532a5e071e640cb3af5946bfc3d6f.tar.gz
system_core-0be19a53cf9532a5e071e640cb3af5946bfc3d6f.tar.bz2
Merge "libusbhost: Fix IOCTL call during usb_request_cancel" into lmp-dev
-rw-r--r--libusbhost/usbhost.c2
1 files changed, 1 insertions, 1 deletions
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 @@ struct usb_request *usb_request_wait(struct usb_device *dev)
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);
}