diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-08 14:07:48 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-08 14:07:48 +0200 |
| commit | 67ba5293f705eb1d1b98710e5ccb0f615936a6fc (patch) | |
| tree | cdb4cfd94033b5c0f42eeb4de368802049880a12 /drivers/usb/gadget/uvc_v4l2.c | |
| parent | 86627c93b35082f7a0e4d3111546943984b932c7 (diff) | |
| parent | d909a81b198a397593495508c4a5755fe95552fb (diff) | |
| download | op-kernel-dev-67ba5293f705eb1d1b98710e5ccb0f615936a6fc.zip op-kernel-dev-67ba5293f705eb1d1b98710e5ccb0f615936a6fc.tar.gz | |
Merge branch 'smp/threadalloc' into smp/hotplug
Reason: Pull in the separate branch which was created so arch/tile can
base further work on it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/usb/gadget/uvc_v4l2.c')
| -rw-r--r-- | drivers/usb/gadget/uvc_v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/uvc_v4l2.c b/drivers/usb/gadget/uvc_v4l2.c index f6e083b..54d7ca5 100644 --- a/drivers/usb/gadget/uvc_v4l2.c +++ b/drivers/usb/gadget/uvc_v4l2.c @@ -39,7 +39,7 @@ uvc_send_response(struct uvc_device *uvc, struct uvc_request_data *data) if (data->length < 0) return usb_ep_set_halt(cdev->gadget->ep0); - req->length = min(uvc->event_length, data->length); + req->length = min_t(unsigned int, uvc->event_length, data->length); req->zero = data->length < uvc->event_length; req->dma = DMA_ADDR_INVALID; |
