diff options
| author |   Rafał Miłecki <zajec5@gmail.com> | 2012-02-24 07:22:51 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-02-27 14:06:42 -0500 |
| commit | fda82417884eecd9f2c8b4e6bb2039def0da7ec4 (patch) | |
| tree | dc6de6f12e5c3a51ed303cc2a1da4e9404b37546 /drivers | |
| parent | brcm80211: fmac: fix a couple checking after dereference bugs (diff) | |
| download | linux-dev-fda82417884eecd9f2c8b4e6bb2039def0da7ec4.tar.xz linux-dev-fda82417884eecd9f2c8b4e6bb2039def0da7ec4.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 7c54d1db4a44..d4a9e8e7deb3 100644 --- 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 = { |