From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 886C5C636D4 for ; Mon, 30 Jan 2023 14:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237348AbjA3OQZ (ORCPT ); Mon, 30 Jan 2023 09:16:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237365AbjA3OQX (ORCPT ); Mon, 30 Jan 2023 09:16:23 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B9903C2A7 for ; Mon, 30 Jan 2023 06:16:22 -0800 (PST) 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 E8B2961022 for ; Mon, 30 Jan 2023 14:16:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE4EBC433EF; Mon, 30 Jan 2023 14:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675088181; bh=27pnBXjsOMh7kid70Q6rXg/J9xU4A3n3I7LwQwnSPjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TeWoPtGFZ+WPCBUaunorixlS9z271+90nHKFiUvzZvWk1Ow7nMO1mAYv/8a3lM9tm iWPEaioiOGtX0secH+E1Q40imARC64T+hdZObHWzttFMXU9gVC/2h5TuE7Z9B9jtxk o+RLz+fDbFhRadkCXNa7C33Tp+hay08BP0IUli9k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Archie Pusaka , Abhishek Pandit-Subedi , Luiz Augusto von Dentz , Fedor Pchelkin , Sasha Levin Subject: [PATCH 5.15 143/204] Bluetooth: hci_sync: cancel cmd_timer if hci_open failed Date: Mon, 30 Jan 2023 14:51:48 +0100 Message-Id: <20230130134322.826974957@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130134316.327556078@linuxfoundation.org> References: <20230130134316.327556078@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Archie Pusaka commit 97dfaf073f5881c624856ef293be307b6166115c upstream. If a command is already sent, we take care of freeing it, but we also need to cancel the timeout as well. Signed-off-by: Archie Pusaka Reviewed-by: Abhishek Pandit-Subedi Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Fedor Pchelkin Signed-off-by: Sasha Levin --- net/bluetooth/hci_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index a41b4dcf1a7a..cabe8eb4c14f 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1632,6 +1632,7 @@ static int hci_dev_do_open(struct hci_dev *hdev) hdev->flush(hdev); if (hdev->sent_cmd) { + cancel_delayed_work_sync(&hdev->cmd_timer); kfree_skb(hdev->sent_cmd); hdev->sent_cmd = NULL; } -- 2.39.0