From patchwork Thu Jan 26 13:36:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fedor Pchelkin X-Patchwork-Id: 48657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp276817wrn; Thu, 26 Jan 2023 05:46:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXvmdhUqOWG12VBlOPL3T2QFnVRh42BSyAP3+ccvr/cK0OXAThTZ9VaJfh9f5dKtDmeKYibs X-Received: by 2002:a05:6a20:b2a2:b0:ac:3bb0:5346 with SMTP id ei34-20020a056a20b2a200b000ac3bb05346mr33711561pzb.49.1674740768880; Thu, 26 Jan 2023 05:46:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674740768; cv=none; d=google.com; s=arc-20160816; b=tGwIVQMbupsDqdsB+PUdL7x/tFgGN1FHL0lp83F5ttUpXaEzkBv9birm2lU3zlz7Es WuUrcQry/5yGr4sMI0mEMukZ3X3PbA10QEFSFCcgHeH8hiTl4PGxs2rEEFTrRDkJlgql Y/fblYOKm32cQWiWa2ADG8VbAsUt9iJV2Y1saC/2RT7qLP8cqy2slOH7HV8ft5MZISWv vwFK4KBNgS/muKFEVW7MS3ONEvhxKJ45C21vvqKNn5RDf2xRzS/7aClsyTf0WrhTx3o1 A3vVQs1pCl6ex4pveriD8nf2hAhpyYtHuwPyb8HcZ81m56h29viL/lw6cpCzTM8M3mym VQew== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=u4HtKIzLSzd4F3ze1HvDiXlZa3oeglD+pWYGWv87M9g=; b=rAijMnGqsPXrm3wtXKQOjYQFkyxHlTiMQFakjTMhf4JowYjh+/ZmpOHaBEP9UqdWvM bwLzhOUozitnfRGdI6v172Z9+emC3d95QUF/E5sFPH/xvsFmjWjQ8uHE/+boQMI5RHA1 n6106PA8Gfy/r/7fz8yV+BUaqk/wu+pg+8SLgu9b9vqJGLuYIAUJ5ugYAzxuZ0vR22cG CNMRduVMX0dCIDgHVyxHtBuMBR3wi8gdviAsUrifwcTLsb1yxjmqLclVSTTVGGMBlXOc 26wSVflcKqjx5uyvguELFcxRvPtYI3EMufkFDwK54r7x7ZCP4g+LE1o8ntfZsGhMXoN2 shwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=LCio3+Sc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q30-20020a638c5e000000b004def3029a0bsi705462pgn.319.2023.01.26.05.45.47; Thu, 26 Jan 2023 05:46:08 -0800 (PST) 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; dkim=pass header.i=@ispras.ru header.s=default header.b=LCio3+Sc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237121AbjAZNgh (ORCPT + 99 others); Thu, 26 Jan 2023 08:36:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235630AbjAZNgb (ORCPT ); Thu, 26 Jan 2023 08:36:31 -0500 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CBFC173A; Thu, 26 Jan 2023 05:36:29 -0800 (PST) Received: from fedcomp.intra.ispras.ru (unknown [46.242.14.200]) by mail.ispras.ru (Postfix) with ESMTPSA id 64DC040737D5; Thu, 26 Jan 2023 13:36:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 64DC040737D5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1674740187; bh=u4HtKIzLSzd4F3ze1HvDiXlZa3oeglD+pWYGWv87M9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LCio3+Sc2hDodHSvuXOH7F9JipEsi2Eh1BfRTqa9W/W4GR8FEbS+rIjcnvTsff4vu wSANx27rRbS8P/aBNqWv1oDyWdHDRlDBkxLJE8pnWF2xu/kDyGm7yplsz97TH/6e6f 1ixv5koeiJf54b4zcSFXqN/3S/7OfrjCIx5tndcs= From: Fedor Pchelkin To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: Fedor Pchelkin , Archie Pusaka , Abhishek Pandit-Subedi , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , "David S. Miller" , Jakub Kicinski , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , lvc-project@linuxtesting.org, Luiz Augusto von Dentz Subject: [PATCH 6.1 1/1] Bluetooth: hci_sync: cancel cmd_timer if hci_open failed Date: Thu, 26 Jan 2023 16:36:13 +0300 Message-Id: <20230126133613.815127-2-pchelkin@ispras.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126133613.815127-1-pchelkin@ispras.ru> References: <20230126133613.815127-1-pchelkin@ispras.ru> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1756092944850223913?= X-GMAIL-MSGID: =?utf-8?q?1756092976581859108?= 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 --- net/bluetooth/hci_sync.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 8d6c8cbfe1de..aab3d85f4637 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -4703,6 +4703,7 @@ int hci_dev_open_sync(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; }