Bluetooth: Move error check into the right if-clause
Subsystems (2)
Marcel Holtmann
maintainerPATCH 1/2 Bluetooth: Move error check into the right if-clause
The if-clause for hdev->setup should also include the error handling since that is where the error really comes from. The code currently works correctly since ret=0 is assigned early on, but it is a lot harder to read and understand.
--- net/bluetooth/hci_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/bluetooth/hci_core.c +4 -4
@@ -1446,11 +1446,11 @@ static int hci_dev_do_open(struct hci_dev *hdev) test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {hci_sock_dev_event (hdev,HCI_DEV_SETUP ); -if (hdev->setup) +if (hdev->setup) { ret = hdev->setup (hdev); - -if (ret) - goto setup_failed; +if (ret) + goto setup_failed; + }if (test_bit (HCI_QUIRK_USE_BDADDR_PROPERTY , &hdev->quirks)) {if (!bacmp (&hdev->public_addr,BDADDR_ANY ))
Signature · 1 line
2.23.0
Hi Marcel,
Quoted 9 lines · Marcel Holtmann
The if-clause for
hdev->setupshould also include the error handling since that is where the error really comes from. The code currently works correctly since ret=0 is assigned early on, but it is a lot harder to read and understand.Signed-off-by Marcel Holtmann <[email protected]>--- net/bluetooth/hci_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Both patches in this set have been applied to bluetooth-next. Thanks.
Johan
Marcel Holtmann
maintainerHi Johan,
Quoted 11 lines
Quoted 9 lines
The if-clause for
hdev->setupshould also include the error handling since that is where the error really comes from. The code currently works correctly since ret=0 is assigned early on, but it is a lot harder to read and understand.Signed-off-by Marcel Holtmann <[email protected]>---
net/bluetooth/hci_core.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)Both patches in this set have been applied to bluetooth-next. Thanks.
so my cleanup patch was actually a mistake. In itself it was the right fix, but with the follow up patch, we actually want it that way to allow the invalid_bdaddr variable assignment to be done after hdev->setup.
I posted a v2 now that fixes that. We need to do a push --force to fix this up. A follow up patch would cause a hard to track history.
Regards
Marcel