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=-5.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,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 AA2F7C04AAB for ; Mon, 6 May 2019 14:37:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7038F214C6 for ; Mon, 6 May 2019 14:37:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153429; bh=d7uNJrLitMhqX15euf0F9ce9ER6b9bWi/IESkGcFvrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YOqLKv0ZLfCNoM0/m36dMhtWf/vYJ7fKoMYJMUg4mRqekIAAsa21cgVlMKblq7Gof kux7/lTGpekXS8v1LSQBWf9VCdOBhzi8aslXJfWbUn6bzZJyBq+YwI8Q38ShTUQg2O jljdTYoIXOn5B84KCW2AVqINwyZBECIqR/tN8lX8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727329AbfEFOhI (ORCPT ); Mon, 6 May 2019 10:37:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:57718 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727291AbfEFOhH (ORCPT ); Mon, 6 May 2019 10:37:07 -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 772FC206A3; Mon, 6 May 2019 14:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153427; bh=d7uNJrLitMhqX15euf0F9ce9ER6b9bWi/IESkGcFvrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zYSCoCplaRbHfcaptlwaYEffAQsjU6P7/H7ZF8ar69xMz1nC/ogECRbqkS1kWNyg4 z34FInmwuHvZHjKnvudONtOJQrcDQqN4FWGhwrqinMGRJtQKmpS5Wd7Vng0eFCZHer NrswbGXJJg2AC0qWeVZt+c4fmOOiySDyaFd/0klY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Wang , Marcel Holtmann Subject: [PATCH 5.0 085/122] Bluetooth: mediatek: fix up an error path to restore bdev->tx_state Date: Mon, 6 May 2019 16:32:23 +0200 Message-Id: <20190506143102.378302993@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143054.670334917@linuxfoundation.org> References: <20190506143054.670334917@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sean Wang commit 77f328dbc6cf42f22c691a164958a5452142a542 upstream. Restore bdev->tx_state with clearing bit BTMTKUART_TX_WAIT_VND_EVT when there is an error on waiting for the corresponding event. Fixes: 7237c4c9ec92 ("Bluetooth: mediatek: Add protocol support for MediaTek serial devices") Signed-off-by: Sean Wang Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman --- drivers/bluetooth/btmtkuart.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/bluetooth/btmtkuart.c +++ b/drivers/bluetooth/btmtkuart.c @@ -115,11 +115,13 @@ static int mtk_hci_wmt_sync(struct hci_d TASK_INTERRUPTIBLE, HCI_INIT_TIMEOUT); if (err == -EINTR) { bt_dev_err(hdev, "Execution of wmt command interrupted"); + clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state); return err; } if (err) { bt_dev_err(hdev, "Execution of wmt command timed out"); + clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state); return -ETIMEDOUT; }