summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btbcm.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2015-10-18 16:37:56 -0400
committerMarcel Holtmann <marcel@holtmann.org>2015-10-20 18:49:22 -0400
commit8045ce2197bf61b5b82bbe38fcc5feeaf7348ad1 (patch)
tree04b4cee574e003cbd3079ccd48bbff616b83dd68 /drivers/bluetooth/btbcm.c
parent6c9d435d359898868f71e8ba03f8d5f1cbccaa69 (diff)
Bluetooth: btbcm: Fix firmware version number calculation
The calculation for the firmware version number is off by one bit. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth/btbcm.c')
-rw-r--r--drivers/bluetooth/btbcm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 2fc363a0393d..40ad0e1ccf75 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -323,7 +323,7 @@ int btbcm_initialize(struct hci_dev *hdev, char *fw_name, size_t len)
323 } 323 }
324 324
325 BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name, 325 BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,
326 hw_name ? : "BCM", (subver & 0x7000) >> 13, 326 hw_name ? : "BCM", (subver & 0xe000) >> 13,
327 (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff); 327 (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
328 328
329 return 0; 329 return 0;
@@ -353,7 +353,7 @@ int btbcm_finalize(struct hci_dev *hdev)
353 kfree_skb(skb); 353 kfree_skb(skb);
354 354
355 BT_INFO("%s: BCM (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name, 355 BT_INFO("%s: BCM (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,
356 (subver & 0x7000) >> 13, (subver & 0x1f00) >> 8, 356 (subver & 0xe000) >> 13, (subver & 0x1f00) >> 8,
357 (subver & 0x00ff), rev & 0x0fff); 357 (subver & 0x00ff), rev & 0x0fff);
358 358
359 btbcm_check_bdaddr(hdev); 359 btbcm_check_bdaddr(hdev);
@@ -461,7 +461,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev)
461 } 461 }
462 462
463 BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name, 463 BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,
464 hw_name ? : "BCM", (subver & 0x7000) >> 13, 464 hw_name ? : "BCM", (subver & 0xe000) >> 13,
465 (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff); 465 (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
466 466
467 err = request_firmware(&fw, fw_name, &hdev->dev); 467 err = request_firmware(&fw, fw_name, &hdev->dev);
@@ -490,7 +490,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev)
490 kfree_skb(skb); 490 kfree_skb(skb);
491 491
492 BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name, 492 BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,
493 hw_name ? : "BCM", (subver & 0x7000) >> 13, 493 hw_name ? : "BCM", (subver & 0xe000) >> 13,
494 (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff); 494 (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
495 495
496 /* Read Local Name */ 496 /* Read Local Name */