Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2662299pxj; Mon, 14 Jun 2021 04:19:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3AVD94LrZuJ72Zq0r3Pe88L/fTnbwIY4X8YqJHl15ZBQIXoAB1D7C9HjNhdkLBz7biCE/ X-Received: by 2002:a17:906:b190:: with SMTP id w16mr15046812ejy.332.1623669589805; Mon, 14 Jun 2021 04:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623669589; cv=none; d=google.com; s=arc-20160816; b=Tasl+gAqZ7PuG791wHGgIwEQ9c2wk/jxyZ8ZJqO0aU44oclXLhfujdWdLl5kw/k+/t EcPVsJIZyK+zg/WOliCpsy3brPSflm98tMhUx2ymVKLnvj11PkoCw/jCrIIFjzgvWWYW uTndy5lhPUlp4cjkROPRs6YRJnZKhYty+wE0VKvmBBN3xJfyZOZHe+K/1Yd3/Lkja7bB AMfn5fFYdfcb5l5shkBgoOlznyY3EO6VzLUgl4R7nWXY00eN10x5h7/31Nx7Q0O2Pk+x pQa+JH1EeOOl18GQh0DgGJiJXCVZ8UN4aTxXqY2Ys3pCapUTPM/tkg71EnE3k0MO2Hmp 5K+Q== 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=I/D/elVOYEFfivxz45seWtplAuyhfcAxgH57xfM+QC0=; b=w5n6Tr2TqLvE5PqIawrnB4qRn28pLjKKoE2oCjOrFgI+ASk88A4MI/FINR/exvF82S 7D4wEHzOmCC8xM/bsqFWGiqBqXfkUZKrkNrNbDSTzMm3Ebhg2pulcExJ+a2XHFDEZrm1 M56edVsCSjKdhsclohFfW5k4SVQcheua3ZEsVz7hF6tA6PUU/+oljXi0/vh+tEPkF0Bn sAP9w4cE/6BpYLrzPrt6jQOhVWu+OwmP5q7ST4/a4PEEJ0+OB8q0IAV5M3g4UVB5NVlw lj5lwqs102JzsqkaPREESEut0BbkYxF/C4gMs5vxhNrDKKzIIqESKMCksAC5ZwRCv34e SEUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tpZ3o1dj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g11si10914057edw.414.2021.06.14.04.19.27; Mon, 14 Jun 2021 04:19:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tpZ3o1dj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S235613AbhFNLRi (ORCPT + 99 others); Mon, 14 Jun 2021 07:17:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:39868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235179AbhFNLE5 (ORCPT ); Mon, 14 Jun 2021 07:04:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D2680613CD; Mon, 14 Jun 2021 10:44:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623667481; bh=xGWgius8Z3/tdYkNhDK3yn+bZnV15mwgxqydq89yNhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tpZ3o1djK67/skG4zxE6xCgncgh0bYcjHlsNTaEoVAqIjpY/Y9RzHwr9MsDWft/9x 6LVc/0b4rejFK/olG8zHj5X/redxaBMa/I5z9zyk1D3ko/FtJXdY9BP3CXGKK8Exk/ w4fIEsEKmwICeQuuh/2Y+JDkd8pPdzdRe8ND/Hao= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guenter Roeck , Li Jun Subject: [PATCH 5.10 089/131] usb: typec: tcpm: cancel frs hrtimer when unregister tcpm port Date: Mon, 14 Jun 2021 12:27:30 +0200 Message-Id: <20210614102656.024077503@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102652.964395392@linuxfoundation.org> References: <20210614102652.964395392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Li Jun commit 7ade4805e296c8d1e40c842395bbe478c7210555 upstream. Like the state_machine_timer, we should also cancel possible pending frs hrtimer when unregister tcpm port. Fixes: 8dc4bd073663 ("usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)") Cc: stable Reviewed-by: Guenter Roeck Signed-off-by: Li Jun Link: https://lore.kernel.org/r/1622627829-11070-2-git-send-email-jun.li@nxp.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/tcpm/tcpm.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -5187,6 +5187,7 @@ void tcpm_unregister_port(struct tcpm_po { int i; + hrtimer_cancel(&port->enable_frs_timer); hrtimer_cancel(&port->vdm_state_machine_timer); hrtimer_cancel(&port->state_machine_timer);