diff options
| author |   Rafał Miłecki <zajec5@gmail.com> | 2015-05-20 13:59:54 +0200 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2015-05-28 11:51:20 +0300 |
| commit | 279b4cb7bc143643b6380a7198834f3bfbee7df7 (patch) | |
| tree | 9fe98ea141247d95b821ca1c2ed49a39fb12271d | |
| parent | brcmfmac: simplify check finding NVRAM v1 device path (diff) | |
| download | linux-dev-279b4cb7bc143643b6380a7198834f3bfbee7df7.tar.xz linux-dev-279b4cb7bc143643b6380a7198834f3bfbee7df7.zip | |
brcmfmac: treat \0 as end of comment when parsing NVRAM
This fixes brcmfmac dealing with NVRAM coming from platform e.g. from a
flash MTD partition. In such cases entries are separated by \0 instead
of \n which caused ignoring whole content after the first "comment".
While platform NVRAM doesn't usually contain comments, we switch to
COMMENT state after e.g. finding an unexpected char in key name.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c index a1e1253a06c8..e6673a9b6e9e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c @@ -162,17 +162,20 @@ brcmf_nvram_handle_value(struct nvram_parser *nvp) static enum nvram_parser_state brcmf_nvram_handle_comment(struct nvram_parser *nvp) { - char *eol, *sol; + char *eoc, *sol; sol = (char *)&nvp->fwnv->data[nvp->pos]; - eol = strchr(sol, '\n'); - if (eol == NULL) - return END; + eoc = strchr(sol, '\n'); + if (!eoc) { + eoc = strchr(sol, '\0'); + if (!eoc) + return END; + } /* eat all moving to next line */ nvp->line++; nvp->column = 1; - nvp->pos += (eol - sol) + 1; + nvp->pos += (eoc - sol) + 1; return IDLE; } |