Message ID | 20231006024707.413349-1-max.chou@realtek.com |
---|---|
State | Accepted |
Commit | 505fc3b0f198e1a47a94dace481ed5a2b3bde92b |
Headers | show |
Series | Bluetooth: btrtl: Ignore error return for hci_devcd_register() | expand |
On 07.10.23 03:00, patchwork-bot+bluetooth@kernel.org wrote: > > This patch was applied to bluetooth/bluetooth-next.git (master) > by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: 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
Hi, On Mon, Oct 16, 2023 at 1:07 AM Linux regression tracking (Thorsten Leemhuis) <regressions@leemhuis.info> wrote: > > On 07.10.23 03:00, patchwork-bot+bluetooth@kernel.org wrote: > > > > This patch was applied to bluetooth/bluetooth-next.git (master) > > by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: > > 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? It is part of the for-net pull-request: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git/tag/?h=for-net-2023-10-13
On 16.10.23 19:20, Luiz Augusto von Dentz wrote: > > On Mon, Oct 16, 2023 at 1:07 AM Linux regression tracking (Thorsten > Leemhuis) <regressions@leemhuis.info> wrote: >> >> On 07.10.23 03:00, patchwork-bot+bluetooth@kernel.org wrote: >>> >>> This patch was applied to bluetooth/bluetooth-next.git (master) >>> by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: >> >> 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? > > It is part of the for-net pull-request: > > https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git/tag/?h=for-net-2023-10-13 Ahh, great -- and sorry, the branch name in the "was applied to bluetooth/bluetooth-next.git" got me on the wrong track. Ciao, Thorsten
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; }