Bluetooth: hci_sync: Fix Opcode prints in bt_dev_dbg/err
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>
Wed, 18 Oct 2023 14:47:35 +0000 (16:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:51:55 +0000 (11:51 +0100)
[ Upstream commit 530886897c789cf77c9a0d4a7cc5549f0768b5f8 ]

Printed Opcodes may be missing leading zeros:

Bluetooth: hci0: Opcode 0x c03 failed: -110

Fix this by always printing leading zeros:

Bluetooth: hci0: Opcode 0x0c03 failed: -110

Fixes: d0b137062b2d ("Bluetooth: hci_sync: Rework init stages")
Fixes: 6a98e3836fa2 ("Bluetooth: Add helper for serialized HCI command execution")
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/bluetooth/hci_sync.c

index 5218c4d..d74fe13 100644 (file)
@@ -151,7 +151,7 @@ struct sk_buff *__hci_cmd_sync_sk(struct hci_dev *hdev, u16 opcode, u32 plen,
        struct sk_buff *skb;
        int err = 0;
 
-       bt_dev_dbg(hdev, "Opcode 0x%4x", opcode);
+       bt_dev_dbg(hdev, "Opcode 0x%4.4x", opcode);
 
        hci_req_init(&req, hdev);
 
@@ -247,7 +247,7 @@ int __hci_cmd_sync_status_sk(struct hci_dev *hdev, u16 opcode, u32 plen,
        skb = __hci_cmd_sync_sk(hdev, opcode, plen, param, event, timeout, sk);
        if (IS_ERR(skb)) {
                if (!event)
-                       bt_dev_err(hdev, "Opcode 0x%4x failed: %ld", opcode,
+                       bt_dev_err(hdev, "Opcode 0x%4.4x failed: %ld", opcode,
                                   PTR_ERR(skb));
                return PTR_ERR(skb);
        }