From patchwork Wed Apr 5 09:31:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Badhri Jagan Sridharan X-Patchwork-Id: 79537 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp178986vqo; Wed, 5 Apr 2023 02:55:22 -0700 (PDT) X-Google-Smtp-Source: AKy350ZIoEd7CP3Ilr+kGs0kG2wyb/2ZKEez69KlaHJZWYK5HrtIxfMSI/p/2CpSYfoM9wZb/xql X-Received: by 2002:a05:6a20:3503:b0:da:949:f074 with SMTP id d3-20020a056a20350300b000da0949f074mr4066790pze.43.1680688521721; Wed, 05 Apr 2023 02:55:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680688521; cv=none; d=google.com; s=arc-20160816; b=qCY3K2evJNTBKBiOBJb9NPhY2AlOOKpQMMPybhveejxETKYKS+0F2TjnlU/PUlCHV7 /4E7mRVTisbF5dr2xluvV7pqb3ZRNN7XJmM3Y2Wr+o08z7sKnQgszK9sWBejP6anwz/0 w232xWJC9eteBfHCotNlz0gxcyLH44UHXE4UmeSEDsbBy89SmeGtH0XJNws7//5GH3wu NmZ89qNAHk6rUg/GhTkCajcC7yZ7KpSdEgLvS4qV9AjHpUHuymyZ1JhZghqZOvp5fEwK k0PXTLGyrGGbfbAwU/ZzZKrMXdoc47i/3QSk5FSCaJp/+nxoh9RCLIWC2xgU+4hmyuzn 7/Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=Z/f7k2pCQfyKc9i/c1APoOdFbnqMktgzwaYI9MvzI7I=; b=bWdmhpkWyxfquCAoKyyTGP4HG4gWVW+V+b+dPqvI6XxImd5/7e7M54aE9LJEGpF17u o7/mijofG9Jtse0xmVKu6/V6sTqPKzGwRqqWJck/n3tzujtwzSgdCiJJWaGK6Wh4RNkE hjK+dcK8FGGeTXbjk0F3NMLXaHU/Cl7WVezbPBzlXUhUy+E08SAcRuQkSL1/OQFLKNNl t3mrX3n3YqXOz5vnGF44t3XArdWRefxoHlPGqvpgs5+h8qP84gI0xYh6HCBvgoFGoMPt VLJ6zolYZTQ1KnCbR/ohy+oFjFSvZixfpKjjIRaSQudgJQxOvDmFnLZXEv2I34HXQfbc d+fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=ekKxX2C3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y1-20020a633201000000b0051344de5b95si11856362pgy.428.2023.04.05.02.55.09; Wed, 05 Apr 2023 02:55:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=ekKxX2C3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237696AbjDEJcs (ORCPT + 99 others); Wed, 5 Apr 2023 05:32:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237792AbjDEJc1 (ORCPT ); Wed, 5 Apr 2023 05:32:27 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5921C55B4 for ; Wed, 5 Apr 2023 02:31:52 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-545e529206eso288932787b3.9 for ; Wed, 05 Apr 2023 02:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680687098; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Z/f7k2pCQfyKc9i/c1APoOdFbnqMktgzwaYI9MvzI7I=; b=ekKxX2C34tJMVaSXEvswV0dn6KXZYLxQfRnib0ncGtIcCdhLZO6fp2nRbolxeyWGzA AYVX07eNPDMYwUsG3dP9BPeP2e5BeikACMPWKsdDgc9PBzoPPBBUTk13ZhX6F2+JKfY6 0OD8NNIJRYP47IGm3P76WE55/EhcYUESreY4vB7hWrB4RXU2uyx6p/zbGqbRv9IrZT1o 3SX29/CnmHD0LUzKLULvlZPEIAsp9DmlVdWIbFIOTDAi41BBAkSO3R3dHc62ZaimoKx5 DMZ56/BJN9X5Vfs7MNZwyOpTZ1qU4u2jyV1QMMmjqflFOkckrT5g9iMG32sRJt8BUZ1F xtPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680687098; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z/f7k2pCQfyKc9i/c1APoOdFbnqMktgzwaYI9MvzI7I=; b=QHQf76OAF36DlMKQCRvfJeL8NY8fwBRPoHCdnddZWJMhvFHt/q9zJw6SKwxOYph3vK fA/qY4lGv7wOqiUUCyKZq+iKHXx633hU+8+QTrqNPMX+h5Q6dxnzU9HqMdVO+/QfJuhc wA3HK4LJtUfQQyGTTfGr4qSWNfSTEVNMAkSPcEy3xGBd8DTu0vremisLG9kQoDWW6evg VLg+YeTMZpjc3D/e7bcV+2YQ8j0O9fzQlnxABqHftKwol1HnYBWoJ0k1LPFB1QCVICqI 9tPVuMAVsqC5oOt9qoScwPQYSPZAg0nnm3zKCFAdK/peWpxK2M/xX8C1RUq9guXijgnw 9hHw== X-Gm-Message-State: AAQBX9fD9lNsXFDkfTiZMhrSbSld4acUeAcTWcNQceEYVydjI7blTHK/ TfiGuZMAD/X04AmmCxFTE4jsNVTDPrQ= X-Received: from badhri.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:6442]) (user=badhri job=sendgmr) by 2002:a81:ad04:0:b0:544:5aa0:e212 with SMTP id l4-20020a81ad04000000b005445aa0e212mr3163443ywh.6.1680687097844; Wed, 05 Apr 2023 02:31:37 -0700 (PDT) Date: Wed, 5 Apr 2023 09:31:33 +0000 In-Reply-To: <20230405093133.1858140-1-badhri@google.com> Mime-Version: 1.0 References: <20230405093133.1858140-1-badhri@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230405093133.1858140-2-badhri@google.com> Subject: [PATCH v1 2/2] usb: gadget: udc: core: Prevent redundant calls to pullup From: Badhri Jagan Sridharan To: gregkh@linuxfoundation.org, stern@rowland.harvard.edu, colin.i.king@gmail.com, xuetao09@huawei.com, quic_eserrao@quicinc.com, water.zhangjiantao@huawei.com, peter.chen@freescale.com, balbi@ti.com Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Badhri Jagan Sridharan X-Spam-Status: No, score=-7.7 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762329646965648230?= X-GMAIL-MSGID: =?utf-8?q?1762329646965648230?= usb_gadget_connect calls gadget->ops->pullup without checking whether gadget->connected was previously set. Make this symmetric to usb_gadget_disconnect by returning early if gadget->connected is already set. Cc: stable@vger.kernel.org Signed-off-by: Badhri Jagan Sridharan Fixes: 5a1da544e572 ("usb: gadget: core: do not try to disconnect gadget if it is not connected") --- drivers/usb/gadget/udc/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 890f92cb6344..7eeaf7dbb350 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -708,6 +708,9 @@ int usb_gadget_connect(struct usb_gadget *gadget) goto out; } + if (gadget->connected) + goto out; + if (gadget->deactivated) { /* * If gadget is deactivated we only save new state.