Commit fda82417 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

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: default avatarRafał Miłecki <zajec5@gmail.com>
Acked-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d4ca0099
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#define BRCMF_USB_CBCTL_READ 1 #define BRCMF_USB_CBCTL_READ 1
#define BRCMF_USB_MAX_PKT_SIZE 1600 #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 { enum usbdev_suspend_state {
USBOS_SUSPEND_STATE_DEVICE_ACTIVE = 0, /* Device is busy, won't allow 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) ...@@ -1229,7 +1229,7 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
if (devinfo->image) if (devinfo->image)
return 0; return 0;
fwname = BRCMF_USB_FW_NAME; fwname = BRCMF_USB_43236_FW_NAME;
err = request_firmware(&fw, fwname, devinfo->dev); err = request_firmware(&fw, fwname, devinfo->dev);
if (!fw) { if (!fw) {
...@@ -1596,7 +1596,7 @@ static struct usb_device_id brcmf_usb_devid_table[] = { ...@@ -1596,7 +1596,7 @@ static struct usb_device_id brcmf_usb_devid_table[] = {
{ } { }
}; };
MODULE_DEVICE_TABLE(usb, 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 */ /* TODO: suspend and resume entries */
static struct usb_driver brcmf_usbdrvr = { static struct usb_driver brcmf_usbdrvr = {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment