2023-10-06 02:48:33

by Max Chou

[permalink] [raw]
Subject: [PATCH] Bluetooth: btrtl: Ignore error return for hci_devcd_register()

From: Max Chou <[email protected]>

If CONFIG_DEV_COREDUMP was not set, it would return -EOPNOTSUPP for
hci_devcd_register().
In this commit, ignore error return for hci_devcd_register().
Otherwise Bluetooth initialization will be failed.

Fixes: 044014ce85a1 ("Bluetooth: btrtl: Add Realtek devcoredump support")
Cc: [email protected]
Reported-by: Kirill A. Shutemov <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]/T/
Signed-off-by: Max Chou <[email protected]>
---
drivers/bluetooth/btrtl.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 84c2c2e1122f..277d039ecbb4 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -962,13 +962,10 @@ static void btrtl_dmp_hdr(struct hci_dev *hdev, struct sk_buff *skb)
skb_put_data(skb, buf, strlen(buf));
}

-static int btrtl_register_devcoredump_support(struct hci_dev *hdev)
+static void btrtl_register_devcoredump_support(struct hci_dev *hdev)
{
- int err;
+ hci_devcd_register(hdev, btrtl_coredump, btrtl_dmp_hdr, NULL);

- err = hci_devcd_register(hdev, btrtl_coredump, btrtl_dmp_hdr, NULL);
-
- return err;
}

void btrtl_set_driver_name(struct hci_dev *hdev, const char *driver_name)
@@ -1255,8 +1252,7 @@ int btrtl_download_firmware(struct hci_dev *hdev,
}

done:
- if (!err)
- err = btrtl_register_devcoredump_support(hdev);
+ btrtl_register_devcoredump_support(hdev);

return err;
}
--
2.34.1


2023-10-06 03:42:06

by bluez.test.bot

[permalink] [raw]
Subject: RE: Bluetooth: btrtl: Ignore error return for hci_devcd_register()

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=790472

---Test result---

Test Summary:
CheckPatch PASS 0.73 seconds
GitLint PASS 0.33 seconds
SubjectPrefix PASS 0.10 seconds
BuildKernel PASS 40.12 seconds
CheckAllWarning PASS 45.09 seconds
CheckSparse PASS 55.18 seconds
CheckSmatch PASS 137.56 seconds
BuildKernel32 PASS 39.90 seconds
TestRunnerSetup PASS 604.57 seconds
TestRunner_l2cap-tester PASS 35.76 seconds
TestRunner_iso-tester PASS 64.91 seconds
TestRunner_bnep-tester PASS 12.59 seconds
TestRunner_mgmt-tester PASS 256.81 seconds
TestRunner_rfcomm-tester PASS 18.53 seconds
TestRunner_sco-tester PASS 21.77 seconds
TestRunner_ioctl-tester PASS 21.13 seconds
TestRunner_mesh-tester PASS 15.45 seconds
TestRunner_smp-tester PASS 16.27 seconds
TestRunner_userchan-tester PASS 13.01 seconds
IncrementalBuild PASS 36.47 seconds



---
Regards,
Linux Bluetooth

Subject: Re: [PATCH] Bluetooth: btrtl: Ignore error return for hci_devcd_register()

On 07.10.23 03:00, [email protected] wrote:
>
> This patch was applied to bluetooth/bluetooth-next.git (master)
> by Luiz Augusto von Dentz <[email protected]>:

Hi Luiz. Many thx for picking this up. From the branch name is sounds
like you plan to submit this change in the next merge window (If I
misread the signs feel free to ignore this mail!). Wouldn't it be better
to merge this in this cycle, as the commit afaics fixes a regression
that was only introduced this cycle?

Ciao, Thorsten