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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 1ABAFC2D0C3 for ; Mon, 16 Dec 2019 18:39:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF52720684 for ; Mon, 16 Dec 2019 18:39:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576521599; bh=wt0WRKfT+mFhJVVLszjhqDZpzf0N7Z7TbYfqB+nxUsg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qbiKcltyy9Xk1t5UBmLSNhch/2ZvoNbZvIgT1ZwhAtEfIQ3YhRCs8FKf4btluwYia HPrL8MDEvhHGPAWrUjEFlTHCim0/eYz61fJ70UOdOquh26bNImBKqaIC3CYxYpo/RY l9TC0MHDZXa44hwqjHUnb0zr/8EokKhaMdhsotJo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728952AbfLPSCq (ORCPT ); Mon, 16 Dec 2019 13:02:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:38748 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729370AbfLPSCi (ORCPT ); Mon, 16 Dec 2019 13:02:38 -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 8121D207FF; Mon, 16 Dec 2019 18:02:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576519358; bh=wt0WRKfT+mFhJVVLszjhqDZpzf0N7Z7TbYfqB+nxUsg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AeAMFWrNopi7wo7lXNMZiPPCdeRc1PfhucNgAHoOn4W2ofrlMQWwTYOrHOt4+4zdf +f6BLYX/ITz0X/oGRws9LUZ61+9dGqqx9dc3ZqDY55NzY53g8u2NDFFpSUXb16xVPE DKh8YKtVeyK1kljZiVcK9RcdvVunhlZ2YeMqV9gE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tejas Joglekar , Felipe Balbi Subject: [PATCH 4.19 033/140] usb: dwc3: gadget: Fix logical condition Date: Mon, 16 Dec 2019 18:48:21 +0100 Message-Id: <20191216174758.365597488@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174747.111154704@linuxfoundation.org> References: <20191216174747.111154704@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: Tejas Joglekar commit 8c7d4b7b3d43c54c0b8c1e4adb917a151c754196 upstream. This patch corrects the condition to kick the transfer without giving back the requests when either request has remaining data or when there are pending SGs. The && check was introduced during spliting up the dwc3_gadget_ep_cleanup_completed_requests() function. Fixes: f38e35dd84e2 ("usb: dwc3: gadget: split dwc3_gadget_ep_cleanup_completed_requests()") Cc: stable@vger.kernel.org Signed-off-by: Tejas Joglekar Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc3/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2295,7 +2295,7 @@ static int dwc3_gadget_ep_cleanup_comple req->request.actual = req->request.length - req->remaining; - if (!dwc3_gadget_ep_request_completed(req) && + if (!dwc3_gadget_ep_request_completed(req) || req->num_pending_sgs) { __dwc3_gadget_kick_transfer(dep); goto out;