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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 B6B3BC432C0 for ; Tue, 19 Nov 2019 05:52:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 809EC20862 for ; Tue, 19 Nov 2019 05:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142763; bh=OQxAjtgjoRmh71w/KKY3w4GztgCDEsVjgMRHOe26tms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iUkV41xaB5bN73Vx/QXdVaQA3UVFf7vD4KyauWIPVM1SKbjqVSmiSRLm+hwG+Fqcd 0forZ17IQ8WIsOJgn7l+ulY/Hqm5LMqwYXCBD1EcUrtLqX8MLdK/MHg3UYddV6qN59 WWxA8DPJ30BVBuL8s/VSzhEbotUziegbSdtHLXww= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731937AbfKSFwm (ORCPT ); Tue, 19 Nov 2019 00:52:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:50442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731596AbfKSFwj (ORCPT ); Tue, 19 Nov 2019 00:52:39 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 37DAB20862; Tue, 19 Nov 2019 05:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142758; bh=OQxAjtgjoRmh71w/KKY3w4GztgCDEsVjgMRHOe26tms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=twaL67y8LceUitYMheaLJQU4zJMtDfGQSaT/bIB2H/FwJddSzpQI6eAyGqYRgezhx J9+iFUlUMRHAF1m0tVOcz0xNTvaFUeDGnik3rcN7MxBC7OZWN4PN/b6HO6M2GuCIbN 0LvAxjOM8hTz/vfRYUszJbXVRhbfKt3q6jl7f+Ew= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Laurent Pinchart , Paul Elder , Kieran Bingham , Sasha Levin Subject: [PATCH 4.14 190/239] usb: gadget: uvc: Only halt video streaming endpoint in bulk mode Date: Tue, 19 Nov 2019 06:19:50 +0100 Message-Id: <20191119051335.493931245@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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