brcm80211: fmac: use correct firmware filename

Also don't use so generic BRCMF_USB_FW_NAME as we may need different
firmwares in the future.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 7c54d1db4a44432f9e6bf744dc6c6d1bec7946c3..d4a9e8e7deb3c31659b64213c4469c4f6a2906d8 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -65,7 +65,7 @@
 #define BRCMF_USB_CBCTL_READ   1
 #define BRCMF_USB_MAX_PKT_SIZE 1600
 
-#define BRCMF_USB_FW_NAME      "brcm/brcmfmac-usb.bin"
+#define BRCMF_USB_43236_FW_NAME        "brcm/brcmfmac43236b.bin"
 
 enum usbdev_suspend_state {
        USBOS_SUSPEND_STATE_DEVICE_ACTIVE = 0, /* Device is busy, won't allow
@@ -1229,7 +1229,7 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
        if (devinfo->image)
                return 0;
 
-       fwname = BRCMF_USB_FW_NAME;
+       fwname = BRCMF_USB_43236_FW_NAME;
 
        err = request_firmware(&fw, fwname, devinfo->dev);
        if (!fw) {
@@ -1596,7 +1596,7 @@ static struct usb_device_id brcmf_usb_devid_table[] = {
        { }
 };
 MODULE_DEVICE_TABLE(usb, brcmf_usb_devid_table);
-MODULE_FIRMWARE(BRCMF_USB_FW_NAME);
+MODULE_FIRMWARE(BRCMF_USB_43236_FW_NAME);
 
 /* TODO: suspend and resume entries */
 static struct usb_driver brcmf_usbdrvr = {