diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-10 17:00:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-10 17:00:24 -0400 |
| commit | 5c4d5e816c2cc86e17d09677b649be47fbc30e51 (patch) | |
| tree | b13327e59b6ea29095b9b33b4cdd5dffab9a66d3 /drivers/net/wireless/brcm80211/brcmfmac | |
| parent | f473832fece16611520bf54ad52b16c3f6db0a94 (diff) | |
| parent | 2c4db12ec469b9fcdad9f6bfd6fa20e65a563ac5 (diff) | |
| download | blackbird-op-linux-5c4d5e816c2cc86e17d09677b649be47fbc30e51.tar.gz blackbird-op-linux-5c4d5e816c2cc86e17d09677b649be47fbc30e51.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/usb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 839bcda9465a..b732a99e402c 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -1183,8 +1183,6 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo) bus->bus_priv.usb = bus_pub; dev_set_drvdata(dev, bus); bus->ops = &brcmf_usb_bus_ops; - bus->chip = bus_pub->devid; - bus->chiprev = bus_pub->chiprev; bus->proto_type = BRCMF_PROTO_BCDC; bus->always_use_fws_queue = true; @@ -1193,6 +1191,9 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo) if (ret) goto fail; } + bus->chip = bus_pub->devid; + bus->chiprev = bus_pub->chiprev; + /* request firmware here */ brcmf_fw_get_firmwares(dev, 0, brcmf_usb_get_fwname(devinfo), NULL, brcmf_usb_probe_phase2); |
