]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
usb: gadget: function: uvc: return correct alt-setting
authorFelipe Balbi <balbi@ti.com>
Mon, 29 Sep 2014 16:13:26 +0000 (11:13 -0500)
committerFelipe 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

index e00e8b79390af1593fe0283e53fee8f01ef9942e..4138ad5adb77355e1a4cd398fe523b1b4f788ee6 100644 (file)
@@ -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