From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5ABC824E4BF; Tue, 29 Apr 2025 18:19:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745950791; cv=none; b=fk2uIJBxuqhD6mZgrYwG6bVprciL5AY1toDZCytgGACWfi3b7bN4neVOjLqAJcHEJHr4k4KHzSTLsZZfCM6bKYQiHcG8CDmgmUk1oJjpQQwE5H12ocbhJFkI7U+iC+HjnRMSzrh8ToebIcgHvC3KfFP57dmvzkNL5MtkXXvdHgY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745950791; c=relaxed/simple; bh=VSz89XRYeUhwuOOff2F8leeC6nlAD0MSbJpnzc6Oav8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UTvn+Hw3dwKbfaNjVxmVv0CzcTmxs7zOrGJKtn4Ig/X2YZrOwlgtMe1qJY4RhlqD3WkE1EvK6knhO2vggFumiLni/PO+OtNkTn4m1sqK4s1j0c8B0py565VLxPXKQe+w2o3ftISsWSMQOiwp6fBnk7AsFjjaFHRztSso34B0rjI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=l8jxFu6H; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="l8jxFu6H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CABA8C4CEE3; Tue, 29 Apr 2025 18:19:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745950791; bh=VSz89XRYeUhwuOOff2F8leeC6nlAD0MSbJpnzc6Oav8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l8jxFu6HxKrHUnNHgRn/l7xiClBp01Yjsns1GJZsq+oX2SYjgQ992JelKwi7hbqdo eTr7lH73ppzIzxg+T3Tk3Bw7BYm+vPcCnoHOLtHSYiSSukw37iP1AT7+YH2y3ojmh2 0q97sh8XMTAnkMsDHWKAsxttVY5/VAYsuYN8qlnw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Ian Abbott Subject: [PATCH 6.6 194/204] comedi: jr3_pci: Fix synchronous deletion of timer Date: Tue, 29 Apr 2025 18:44:42 +0200 Message-ID: <20250429161107.311140298@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161059.396852607@linuxfoundation.org> References: <20250429161059.396852607@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Abbott commit 44d9b3f584c59a606b521e7274e658d5b866c699 upstream. When `jr3_pci_detach()` is called during device removal, it calls `timer_delete_sync()` to stop the timer, but the timer expiry function always reschedules the timer, so the synchronization is ineffective. Call `timer_shutdown_sync()` instead. It does not matter that the timer expiry function pointer is cleared, because the device is being removed. Fixes: 07b509e6584a5 ("Staging: comedi: add jr3_pci driver") Cc: stable Signed-off-by: Ian Abbott Link: https://lore.kernel.org/r/20250415123901.13483-1-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman --- drivers/comedi/drivers/jr3_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/comedi/drivers/jr3_pci.c +++ b/drivers/comedi/drivers/jr3_pci.c @@ -758,7 +758,7 @@ static void jr3_pci_detach(struct comedi struct jr3_pci_dev_private *devpriv = dev->private; if (devpriv) - del_timer_sync(&devpriv->timer); + timer_shutdown_sync(&devpriv->timer); comedi_pci_detach(dev); }