diff mbox series

Bluetooth: btrtl: Ignore error return for hci_devcd_register()

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

Commit Message

Max Chou Oct. 6, 2023, 2:47 a.m. UTC 
From: Max Chou <max.chou@realtek.com>

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: stable@vger.kernel.org
Reported-by: Kirill A. Shutemov <kirill@shutemov.name>
Closes: https://lore.kernel.org/all/ZRyqIn0_qqEFBPdy@debian.me/T/
Signed-off-by: Max Chou <max.chou@realtek.com>
---
 drivers/bluetooth/btrtl.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Linux regression tracking (Thorsten Leemhuis) Oct. 16, 2023, 8:07 a.m. UTC | #1 
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
Luiz Augusto von Dentz Oct. 16, 2023, 5:20 p.m. UTC | #2 
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
Linux regression tracking (Thorsten Leemhuis) Oct. 17, 2023, 6:04 a.m. UTC | #3 
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 mbox series

Patch

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;
 }