]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Bluetooth: ISO: Clean up returns values in iso_connect_ind()
authorDan Carpenter <dan.carpenter@linaro.org>
Sat, 2 Mar 2024 08:30:43 +0000 (11:30 +0300)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 6 Mar 2024 22:27:09 +0000 (17:27 -0500)
This function either returns 0 or HCI_LM_ACCEPT.  Make it clearer which
returns are which and delete the "lm" variable because it is no longer
required.

Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
net/bluetooth/iso.c

index 30c777c469f96f7d5960423b763fa8651e904bb5..8af75d37b14c01fe1a6d825ef793eda004d21cb3 100644 (file)
@@ -1910,7 +1910,6 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
        struct hci_evt_le_big_info_adv_report *ev2;
        struct hci_ev_le_per_adv_report *ev3;
        struct sock *sk;
-       int lm = 0;
 
        bt_dev_dbg(hdev, "bdaddr %pMR", bdaddr);
 
@@ -1954,7 +1953,7 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
 
                        if (sk && test_bit(BT_SK_PA_SYNC_TERM,
                                           &iso_pi(sk)->flags))
-                               return lm;
+                               return 0;
                }
 
                if (sk) {
@@ -2041,16 +2040,14 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
 
 done:
        if (!sk)
-               return lm;
-
-       lm |= HCI_LM_ACCEPT;
+               return 0;
 
        if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags))
                *flags |= HCI_PROTO_DEFER;
 
        sock_put(sk);
 
-       return lm;
+       return HCI_LM_ACCEPT;
 }
 
 static void iso_connect_cfm(struct hci_conn *hcon, __u8 status)