Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1427912iob; Thu, 5 May 2022 00:33:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/hBrhOVMYtRUQmA1+uyn0Ed4AGv6MQ4wCEyjwqjt7lV+ps0qVrEdTpFNHkyg2cz9xqfT5 X-Received: by 2002:a17:90a:170c:b0:1dc:20c4:6354 with SMTP id z12-20020a17090a170c00b001dc20c46354mr4465873pjd.113.1651735994883; Thu, 05 May 2022 00:33:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651735994; cv=none; d=google.com; s=arc-20160816; b=tdHw/DdCKTGlANM85t3UtiFJFfTS2JO91ug0pTCBTQkBuiYgqzHEc0WvWV6TXsobXd 79ypmecVtNkKy0MZNFjxpoaJM4L7V6h34IWkfgO6fyQL8pEivW+qi1VkRyXyFWC60h4C 3zzjj5uq6Ow9UTMUdqThDZxCYOhVExXtEfvn3bssdtQiS52xGXO0zsw9ALEJQOe5kAYP PUiMSC5sX4h3lR5F6rCmg2D9xPrJdIPf4xp6DUNRC6XENafLKDOL/P8DRSaZ1FeQTIKO lIiBpdP4CSyv80U9j39MGSXgd13YTC255D/N1DlTsqkrQz/QaozdpINKvOlx/SxItSHg O59Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+nlRmOUEBE1q4m0dvF4/cbj30z6dsNMc8tIVZBBAKUw=; b=joDxvYFz/LjTd+feF/sZp7xKD+ZSbHiFuIROk69n6XoyZyS7xvEhOBLY7hu5eRuFZa wPAeOc2wesQl3j8ZAknuk/mNLpUy0TA7qYMxx3SjwU/n1ZfXbImKwKKb0TAjuL9bj8pZ 7mQwsYmzZ08FP2jop2t7X/hS0DI/G45tmBbH5rH2ZLCPS4CLcY3ANIodfH6VvRlP670y iRgk5FtmAwizLZJbXazqntL9ivqi7UQjvcDmB6w/7n/dbAx+PULrFTOXRNnMybWIWOKX CauXj541v+G7fG9OdGirgn/TykMNvhasm9q/txHajrGTK80+ztV+seezrQcjkJmVd4FG U/6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KMsZp166; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q11-20020a65524b000000b0039d678a64e2si810359pgp.232.2022.05.05.00.33.00; Thu, 05 May 2022 00:33:14 -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=@linuxfoundation.org header.s=korg header.b=KMsZp166; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359160AbiEDRjg (ORCPT + 99 others); Wed, 4 May 2022 13:39:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356811AbiEDRJo (ORCPT ); Wed, 4 May 2022 13:09:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 629321FA77; Wed, 4 May 2022 09:55:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F2C19616F8; Wed, 4 May 2022 16:55:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47000C385A4; Wed, 4 May 2022 16:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683344; bh=kscUROeCRE3O/E7CUAcG4kFKztYxg8m/TICMXx6czhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KMsZp166GDNAaI0wnp17FyGk7rfmp5hRDArluXGvNGoIs547RvxJDNfO5f4ab5buJ 6KCsRg4VZrpVMTYZIinkXN8PYE1tqLbBFoTj6Dur2wgFw2N0SNlW/4KAPWZeyGwqKg Kj70U34uZMx9JDNmd/54JSy/KGxsNsrufvkLGsHU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vijayavardhan Vennapusa , Dan Vacura , stable Subject: [PATCH 5.17 023/225] usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind() Date: Wed, 4 May 2022 18:44:21 +0200 Message-Id: <20220504153112.388885928@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 From: Vijayavardhan Vennapusa commit bf95c4d4630c7a2c16e7b424fdea5177d9ce0864 upstream. If any function like UVC is deactivating gadget as part of composition switch which results in not calling pullup enablement, it is not getting enabled after switch to new composition due to this deactivation flag not cleared. This results in USB enumeration not happening after switch to new USB composition. Hence clear deactivation flag inside gadget structure in configfs_composite_unbind() before switch to new USB composition. Signed-off-by: Vijayavardhan Vennapusa Signed-off-by: Dan Vacura Cc: stable Link: https://lore.kernel.org/r/20220413211038.72797-1-w36195@motorola.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/configfs.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -1434,6 +1434,8 @@ static void configfs_composite_unbind(st usb_ep_autoconfig_reset(cdev->gadget); spin_lock_irqsave(&gi->spinlock, flags); cdev->gadget = NULL; + cdev->deactivations = 0; + gadget->deactivated = false; set_gadget_data(gadget, NULL); spin_unlock_irqrestore(&gi->spinlock, flags); }