projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c92bae7
)
usb: gadget: function: uvc: return correct alt-setting
author
Felipe Balbi
<balbi@ti.com>
Mon, 29 Sep 2014 16:13:26 +0000
(11:13 -0500)
committer
Felipe Balbi
<balbi@ti.com>
Mon, 20 Oct 2014 20:58:48 +0000
(15:58 -0500)
If our alternate setting has been selected, we must
return that on a subsequent Get Interface request
even if we're not streaming.
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/function/f_uvc.c
patch
|
blob
|
history
diff --git
a/drivers/usb/gadget/function/f_uvc.c
b/drivers/usb/gadget/function/f_uvc.c
index
e00e8b7
..
4138ad5
100644
(file)
--- a/
drivers/usb/gadget/function/f_uvc.c
+++ b/
drivers/usb/gadget/function/f_uvc.c
@@
-279,7
+279,7
@@
uvc_function_get_alt(struct usb_function *f, unsigned interface)
else if (interface != uvc->streaming_intf)
return -EINVAL;
else
- return uvc->
state == UVC_STATE_STREAMING
? 1 : 0;
+ return uvc->
video.ep->driver_data
? 1 : 0;
}
static int