From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AFA5C17443 for ; Sun, 10 Nov 2019 02:56:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63017214E0 for ; Sun, 10 Nov 2019 02:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354597; bh=OQxAjtgjoRmh71w/KKY3w4GztgCDEsVjgMRHOe26tms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ibyZeS92oYcGy2kqZNtZwIrBHljl2C6S5h8hZKWPvBp5bqAvUEKvss2LbdvaYTFZX 5EJCZlupAqWNtzW3xmeJ7pacffC6ZuLp/RrFguO9vxUJMK04LxEn2N9wpw/q6KGE1a 57czZKqwo7yRvgqNVZW2ngLa/2ijBQ68OI0uBUPk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726857AbfKJC40 (ORCPT ); Sat, 9 Nov 2019 21:56:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:60080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729558AbfKJCtt (ORCPT ); Sat, 9 Nov 2019 21:49:49 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4D7E422594; Sun, 10 Nov 2019 02:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354189; bh=OQxAjtgjoRmh71w/KKY3w4GztgCDEsVjgMRHOe26tms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e70jeU/2wmJM9Z2F52PCMvIvToBNHawt636Sk+H0k9hmANy6i863F5lDlX1icn2rB BFQpqNF+1blP3vk/R38FFXo2Nw3xCHA4tXaW7bP+gfnXGTFhS6fqPkx4PXvxajFqsG ixQ50QNtpO9hXZRhg2PUwwnxNFz8KCOwLQpINAj8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Laurent Pinchart , Paul Elder , Kieran Bingham , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 37/66] usb: gadget: uvc: Only halt video streaming endpoint in bulk mode Date: Sat, 9 Nov 2019 21:48:16 -0500 Message-Id: <20191110024846.32598-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191110024846.32598-1-sashal@kernel.org> References: <20191110024846.32598-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Laurent Pinchart [ Upstream commit 8dbf9c7abefd5c1434a956d5c6b25e11183061a3 ] When USB requests for video data fail to be submitted, the driver signals a problem to the host by halting the video streaming endpoint. This is only valid in bulk mode, as isochronous transfers have no handshake phase and can't thus report a stall. The usb_ep_set_halt() call returns an error when using isochronous endpoints, which we happily ignore, but some UDCs complain in the kernel log. Fix this by only trying to halt the endpoint in bulk mode. Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder Tested-by: Paul Elder Reviewed-by: Kieran Bingham Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/uvc_video.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c index 540917f54506a..d6bab12b0b47d 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -136,7 +136,9 @@ static int uvcg_video_ep_queue(struct uvc_video *video, struct usb_request *req) ret = usb_ep_queue(video->ep, req, GFP_ATOMIC); if (ret < 0) { printk(KERN_INFO "Failed to queue request (%d).\n", ret); - usb_ep_set_halt(video->ep); + /* Isochronous endpoints can't be halted. */ + if (usb_endpoint_xfer_bulk(video->ep->desc)) + usb_ep_set_halt(video->ep); } return ret; -- 2.20.1