Bluetooth: hci_sync: call destroy in hci_cmd_sync_run if immediate

hci_cmd_sync_run() may run the work immediately if called from existing
sync work (otherwise it queues a new sync work). In this case it fails
to call the destroy() function.

On immediate run, make it behave same way as if item was queued
successfully: call destroy, and return 0.

The only callsite is hci_abort_conn() via hci_cmd_sync_run_once(), and
this changes its return value. However, its return value is not used
except as the return value for hci_disconnect(), and nothing uses the
return value of hci_disconnect(). Hence there should be no behavior
change anywhere.

Fixes: c898f6d7b093b ("Bluetooth: hci_sync: Introduce hci_cmd_sync_run/hci_cmd_sync_run_once")
Signed-off-by: Pauli Virtanen <pav@iki.fi>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 45d16639874a0b82663fe42d46bf66e013122cc1..6283a4df78b0055647ebd0b3bc3c700628d3792d 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -801,8 +801,15 @@ int hci_cmd_sync_run(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,
                return -ENETDOWN;
 
        /* If on cmd_sync_work then run immediately otherwise queue */
-       if (current_work() == &hdev->cmd_sync_work)
-               return func(hdev, data);
+       if (current_work() == &hdev->cmd_sync_work) {
+               int err;
+
+               err = func(hdev, data);
+               if (destroy)
+                       destroy(hdev, data, err);
+
+               return 0;
+       }
 
        return hci_cmd_sync_submit(hdev, func, data, destroy);
 }