lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0257/1039] Bluetooth: btusb: Handle download_firmware failure cases
    Date
    From: Mark Chen <mark-yw.chen@mediatek.com>

    [ Upstream commit 00c0ee9850b7b0cb7c40b8daba806ae2245e59d4 ]

    For Mediatek chipset, it can not enabled if there are something wrong
    in btmtk_setup_firmware_79xx(). Thus, the process must be terminated
    and returned error code.

    Fixes: fc342c4dc4087 ("Bluetooth: btusb: Add protocol support for MediaTek MT7921U USB devices")
    Co-developed-by: Sean Wang <sean.wang@mediatek.com>
    Signed-off-by: Sean Wang <sean.wang@mediatek.com>
    Signed-off-by: Mark Chen <mark-yw.chen@mediatek.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/bluetooth/btusb.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
    index c923c38658baa..a766660603634 100644
    --- a/drivers/bluetooth/btusb.c
    +++ b/drivers/bluetooth/btusb.c
    @@ -2895,6 +2895,10 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
    "mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin",
    dev_id & 0xffff, (fw_version & 0xff) + 1);
    err = btusb_mtk_setup_firmware_79xx(hdev, fw_bin_name);
    + if (err < 0) {
    + bt_dev_err(hdev, "Failed to set up firmware (%d)", err);
    + return err;
    + }

    /* It's Device EndPoint Reset Option Register */
    btusb_mtk_uhw_reg_write(data, MTK_EP_RST_OPT, MTK_EP_RST_IN_OUT_OPT);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 04:39    [W:4.210 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site