From patchwork Sat Nov 5 06:00:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 15889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp828998wru; Fri, 4 Nov 2022 23:02:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6BxYttaM8tDqYadYKDrusN3mAhlacl7E+8lsboMwtWUWJyxMK2dbAtz1tGiJ/XpN08DP0X X-Received: by 2002:a17:90b:24f:b0:216:7247:4b9a with SMTP id fz15-20020a17090b024f00b0021672474b9amr10151017pjb.163.1667628167950; Fri, 04 Nov 2022 23:02:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667628167; cv=none; d=google.com; s=arc-20160816; b=k5xJugqmR1cLFi+RGFmGgI4SWTTLX8NBjRuwCeeo4Ae6aOgSGUmkS5Ig6N3mq4jOjY 2/KEzaHflgNVmEQt4TRWr/WTJalM8NovKe5ZtXbAmA5CKYQh0V91dnYnHT9jj6meQHJo TZMdblv9klLpcWBLiHehVR3nGsycd1cM8TxxbzdjMl+Agq0Ms9qaDHL07sAWAeo+SMO2 iTDYktDYs5rMtWHpOytcPJNNmPy1Du0tjIK5FaMVuWrPkm5Tzdcd6Ga4Pu4pSzk/umZY MbL7nmfW800VmaYhvfbBeQvEyEJzADH7SgICowpeQZs7bX/+2uNqFkCZLUaz3LpSc0VZ oDEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=wVxBtLwKv86dTAGFz9Dw8ydg7lI1BQF1eFElfRyc6N4=; b=NwAfVscpgbGqnEdc7AvsbLBmCGK1BEu/KiNgOnCgid1pUxuij2HdmiJuSX62z+AJg6 l/9GY9/kMhoqk3d3COU3r1K4f4WvsqPZnmLFa7YgCtR0FPsR7Y4LV5M/m8whc9g2E8eE JZrxxFxGx6s/SWibrgn7ZR++2YnwMrnJeCyw6ZIa7eXTf1CqJfBeMhMIBkSALM/fRh+o a+RJH/EfMbKKxb8Ho9Hh7pBxLrqox8O7FWfsVEEw3sYjnoPVc0qp+MYrpZ+ea0UEDFCZ Tgb3Yf6eVRAgqS3Wo8o1tEmhMwWbpWrG2cBQBiozjXNN2p//UJQPTTrKDqXPB8jFOSek V77w== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a11-20020a170902ee8b00b001781f860a6dsi1777698pld.228.2022.11.04.23.02.34; Fri, 04 Nov 2022 23:02:47 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbiKEGBv (ORCPT + 99 others); Sat, 5 Nov 2022 02:01:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbiKEGBe (ORCPT ); Sat, 5 Nov 2022 02:01:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE2FC30F7A; Fri, 4 Nov 2022 23:01:31 -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 6CD3660A55; Sat, 5 Nov 2022 06:01:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47C30C43143; Sat, 5 Nov 2022 06:01:30 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1orCFi-007OpY-1Y; Sat, 05 Nov 2022 02:01:58 -0400 Message-ID: <20221105060158.322031906@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 05 Nov 2022 02:00:43 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Thomas Gleixner , Stephen Boyd , Guenter Roeck , Anna-Maria Gleixner , Andrew Morton , Krzysztof Kozlowski , "David S. Miller" , Dan Carpenter , Chengfeng Ye , Lin Ma , Duoming Zhou , netdev@vger.kernel.org Subject: [PATCH v4a 19/38] timers: nfc: pn533: Use timer_shutdown_sync() before freeing timer References: <20221105060024.598488967@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748634873658952687?= X-GMAIL-MSGID: =?utf-8?q?1748634873658952687?= From: "Steven Rostedt (Google)" Before a timer is freed, timer_shutdown_sync() must be called. Link: https://lore.kernel.org/all/20221104054053.431922658@goodmis.org/ Cc: Krzysztof Kozlowski Cc: "David S. Miller" Cc: Dan Carpenter Cc: Chengfeng Ye Cc: Lin Ma Cc: Duoming Zhou Cc: netdev@vger.kernel.org Signed-off-by: Steven Rostedt (Google) Reviewed-by: Krzysztof Kozlowski --- drivers/nfc/pn533/pn533.c | 2 +- drivers/nfc/pn533/uart.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index d9f6367b9993..0a1d0b4e3bb8 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -2788,7 +2788,7 @@ void pn53x_common_clean(struct pn533 *priv) struct pn533_cmd *cmd, *n; /* delete the timer before cleanup the worker */ - del_timer_sync(&priv->listen_timer); + timer_shutdown_sync(&priv->listen_timer); flush_delayed_work(&priv->poll_work); destroy_workqueue(priv->wq); diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c index 07596bf5f7d6..a556acdb947b 100644 --- a/drivers/nfc/pn533/uart.c +++ b/drivers/nfc/pn533/uart.c @@ -310,7 +310,7 @@ static void pn532_uart_remove(struct serdev_device *serdev) pn53x_unregister_nfc(pn532->priv); serdev_device_close(serdev); pn53x_common_clean(pn532->priv); - del_timer_sync(&pn532->cmd_timeout); + timer_shutdown_sync(&pn532->cmd_timeout); kfree_skb(pn532->recv_skb); kfree(pn532); }