diff options
| author |   Arend van Spriel <arend@broadcom.com> | 2015-01-25 20:31:42 +0100 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2015-01-29 09:59:17 +0200 |
| commit | 7f52c81d02a27943e0c45103d7d10f629b0b58ae (patch) | |
| tree | e9f6034c72b171a6e0d21c146ddb421f633421c6 /drivers/net/wireless/brcm80211/brcmfmac/common.c | |
| parent | brcmfmac: show firmware release info in ethtool driver info (diff) | |
| download | linux-dev-7f52c81d02a27943e0c45103d7d10f629b0b58ae.tar.xz linux-dev-7f52c81d02a27943e0c45103d7d10f629b0b58ae.zip | |
brcmfmac: store revinfo retrieval result
When revinfo retrieval fails we can not show the firmware version
in ethtool driver info. Store the result to be used when handling
ethtool driver info callback.
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/common.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/common.c b/drivers/net/wireless/brcm80211/brcmfmac/common.c index 91213a650017..fe54844c75e0 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/common.c @@ -57,10 +57,10 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_REVINFO, &revinfo, sizeof(revinfo)); + ri = &ifp->drvr->revinfo; if (err < 0) { brcmf_err("retrieving revision info failed, %d\n", err); } else { - ri = &ifp->drvr->revinfo; ri->vendorid = le32_to_cpu(revinfo.vendorid); ri->deviceid = le32_to_cpu(revinfo.deviceid); ri->radiorev = le32_to_cpu(revinfo.radiorev); @@ -79,6 +79,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) ri->chippkg = le32_to_cpu(revinfo.chippkg); ri->nvramrev = le32_to_cpu(revinfo.nvramrev); } + ri->result = err; /* query for 'ver' to get version info from firmware */ memset(buf, 0, sizeof(buf)); |