Skip to content

Commit

Permalink
brcm80211: fmac: use correct firmware filename
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafał Miłecki authored and John W. Linville committed Feb 27, 2012
1 parent d4ca009 commit fda8241
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/wireless/brcm80211/brcmfmac/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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 = {
Expand Down

0 comments on commit fda8241

Please sign in to comment.