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=ham 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 EA20DC17443 for ; Sun, 10 Nov 2019 02:59:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5D7F214E0 for ; Sun, 10 Nov 2019 02:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354763; bh=OQxAjtgjoRmh71w/KKY3w4GztgCDEsVjgMRHOe26tms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g9FvUkEfoZt0k8ewYCRWFDYDqQFx0LQVXWT9zi9Gg8j47Dxx8HJpwfBXPR0+kRlzC 1eoeNTOY5NlUVAV+ykY5xJWETI4cgh6j/9Jim/RnGS/xqltCQcl4w4c4J6z2IxJ3iV wooMHYJ5igjV6REQaPYr0DMVal9hnZVRGWvgzjCw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727780AbfKJC7W (ORCPT ); Sat, 9 Nov 2019 21:59:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:47198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729304AbfKJC4r (ORCPT ); Sat, 9 Nov 2019 21:56:47 -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 E16E5222CE; Sun, 10 Nov 2019 02:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354051; bh=OQxAjtgjoRmh71w/KKY3w4GztgCDEsVjgMRHOe26tms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CQGFTodDPnUnVCTKhNFIAAwe7HiQuJi6gyBbdBBaiDmXEgFL4MliBHLQ4jTgUMjH+ 0rpd+qubxigkMt0XZOwf+/VmbbEyVORUWaAa7L4OrqgwxRNBwtnIZA8y8baYfUq4qy 8WnK6PxbiXDONJZrr9Yc3BGQA3URPUPe8y/fG/Z0= 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.14 061/109] usb: gadget: uvc: Only halt video streaming endpoint in bulk mode Date: Sat, 9 Nov 2019 21:44:53 -0500 Message-Id: <20191110024541.31567-61-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191110024541.31567-1-sashal@kernel.org> References: <20191110024541.31567-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