diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index c644b30977bd..34096791364d 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -716,6 +716,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
 		goto done;
 	}
 
+	hci_req_sync_lock(hdev);
+
 	switch (cmd) {
 	case HCISETAUTH:
 		err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_AUTH_ENABLE,
@@ -791,6 +793,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
 		break;
 	}
 
+	hci_req_sync_unlock(hdev);
+
 done:
 	hci_dev_put(hdev);
 	return err;