Bluetooth: btbcm: Bail sooner from btbcm_initialize() when not loading fw

[linux-2.6-microblaze.git] / drivers / bluetooth / btbcm.c

diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index cc3628c..9fa153b 100644 (file)
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -463,6 +463,13 @@ int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done)
                }
        }
 
+       bt_dev_info(hdev, "%s (%3.3u.%3.3u.%3.3u) build %4.4u",
+                   hw_name, (subver & 0xe000) >> 13,
+                   (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
+
+       if (*fw_load_done)
+               return 0;
+
        if (hdev->bus == HCI_USB) {
                /* Read USB Product Info */
                skb = btbcm_read_usb_product(hdev);
@@ -479,13 +486,6 @@ int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done)
                snprintf(fw_name, BCM_FW_NAME_LEN, "brcm/%s.hcd", hw_name);
        }
 
-       bt_dev_info(hdev, "%s (%3.3u.%3.3u.%3.3u) build %4.4u",
-                   hw_name, (subver & 0xe000) >> 13,
-                   (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
-
-       if (*fw_load_done)
-               return 0;
-
        err = request_firmware(&fw, fw_name, &hdev->dev);
        if (err) {
                bt_dev_info(hdev, "BCM: Patch %s not found", fw_name);