diff options
| author |   Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2022-08-03 14:44:13 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2022-08-08 17:05:12 -0700 |
| commit | 889f0346d47a0285093a3b665d1455c084636d9f (patch) | |
| tree | 7e8821d18e058692691ef67b08a1c8e4f08baf3a | |
| parent | Bluetooth: ISO: Fix memory corruption (diff) | |
| download | linux-dev-889f0346d47a0285093a3b665d1455c084636d9f.tar.xz linux-dev-889f0346d47a0285093a3b665d1455c084636d9f.zip | |
Bluetooth: hci_event: Fix build warning with C=1
This fixes the following warning when build with make C=1:
net/bluetooth/hci_event.c:337:15: warning: restricted __le16 degrades to integer
Fixes: a93661203641e ("Bluetooth: Process result of HCI Delete Stored Link Key command")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
| -rw-r--r-- | net/bluetooth/hci_event.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index ea33dd0cd478..485c814cf44a 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -328,14 +328,17 @@ static u8 hci_cc_delete_stored_link_key(struct hci_dev *hdev, void *data, struct sk_buff *skb) { struct hci_rp_delete_stored_link_key *rp = data; + u16 num_keys; bt_dev_dbg(hdev, "status 0x%2.2x", rp->status); if (rp->status) return rp->status; - if (rp->num_keys <= hdev->stored_num_keys) - hdev->stored_num_keys -= le16_to_cpu(rp->num_keys); + num_keys = le16_to_cpu(rp->num_keys); + + if (num_keys <= hdev->stored_num_keys) + hdev->stored_num_keys -= num_keys; else hdev->stored_num_keys = 0; |