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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93569C433E1 for ; Mon, 17 Aug 2020 17:43:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 648EC20716 for ; Mon, 17 Aug 2020 17:43:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597686184; bh=lCX+33kBjmYRuJfN436MhKq8NdcKgsXc1fbu2fP+NFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x+B/xkgWM1EPFgxfYsW8um5cEAV0D6/XAjl5EOwsvOjXbnnHVnYPlKmyLSX9M2qhU FHIkgyvPcfESFHR4wTnNCUL9v2IRankHwc+DoMegUtsgldzKk78p866IUPB9+rz/F/ /FNCk0bvilT1UTR4G31Ov4Zi/lI//klRUqJApk/8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731579AbgHQRnC (ORCPT ); Mon, 17 Aug 2020 13:43:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:54454 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731102AbgHQQQj (ORCPT ); Mon, 17 Aug 2020 12:16:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 218C722D6E; Mon, 17 Aug 2020 16:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680983; bh=lCX+33kBjmYRuJfN436MhKq8NdcKgsXc1fbu2fP+NFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=giRLJthvjGxinZ9M5OrE8Lz1MJ+BfLEY517KuZP6e6DsQPbW+x9mBm9AqlWeZyMLP 42y70cM9OJeoPPh/2e0mQuEHHSfPWUVJsHgWsxNvIYROdjRyM+2gT1AmlRWNfQxIx0 3zaBH//9hdHBDVGf7ctoTnBD8HiP5FJNpZ5jmlKw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Boichat , Marcel Holtmann , Sasha Levin Subject: [PATCH 4.19 106/168] Bluetooth: hci_serdev: Only unregister device if it was registered Date: Mon, 17 Aug 2020 17:17:17 +0200 Message-Id: <20200817143738.991499151@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143733.692105228@linuxfoundation.org> References: <20200817143733.692105228@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicolas Boichat [ Upstream commit 202798db9570104728dce8bb57dfeed47ce764bc ] We should not call hci_unregister_dev if the device was not successfully registered. Fixes: c34dc3bfa7642fd ("Bluetooth: hci_serdev: Introduce hci_uart_unregister_device()") Signed-off-by: Nicolas Boichat Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/hci_serdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c index 46e20444ba19b..d3fb0d657fa52 100644 --- a/drivers/bluetooth/hci_serdev.c +++ b/drivers/bluetooth/hci_serdev.c @@ -369,7 +369,8 @@ void hci_uart_unregister_device(struct hci_uart *hu) struct hci_dev *hdev = hu->hdev; clear_bit(HCI_UART_PROTO_READY, &hu->flags); - hci_unregister_dev(hdev); + if (test_bit(HCI_UART_REGISTERED, &hu->flags)) + hci_unregister_dev(hdev); hci_free_dev(hdev); cancel_work_sync(&hu->write_work); -- 2.25.1