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 851AE3229 for ; Mon, 30 Jan 2023 14:24:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00B4BC433EF; Mon, 30 Jan 2023 14:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675088677; bh=PR1gWmSHAFwpbhHiDyIL5JMhnvhge1SesM8sDVUEz1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n8mtluRcLT0iJk3o7bg1lB7ryLQwbqA/Bdy6o9MA68K5M3lOugKwj0ActLrO4Bb4X 8PRFNhZJrTAPSQBc3UCZ4fe+IG32lkAQQ5xMxcqCjDkdhDvaGUEL3+RVz8GfgWxGr5 DpOowlxjxXewecnA8fDGAvauGXfa0A01yP1iKSoQ= 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.10 099/143] Bluetooth: hci_sync: cancel cmd_timer if hci_open failed Date: Mon, 30 Jan 2023 14:52:36 +0100 Message-Id: <20230130134310.938021661@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130134306.862721518@linuxfoundation.org> References: <20230130134306.862721518@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 2af1477a05ca..08c473aa0113 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1623,6 +1623,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