diff options
| author | Nishanth Menon <nm@ti.com> | 2016-10-11 12:39:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-31 10:12:21 -0400 |
| commit | 7774e97aa77c1fc18283a1ee1bfb9bdf7c6a14f2 (patch) | |
| tree | ca27bb46cf4f2d5b4c2900ffafba805649407005 /board/ti/common/board_detect.c | |
| parent | 2a78c9e7196ff49bdf53d0b88b49b5eb337461fe (diff) | |
ti: common: board_detect: Return a valid empty string for un-initialized eeprom
Current logic for query of revision, board_name, config returns
NULL. Users of these functions do a direct strncmp to compare.
Unfortunately, as per conventions require two valid strings to compare
against and the current implementation causes a crash when compared
with NULL.
We'd still like to maintain the simplistic usage of these APIs instead
of redundant if (string) res=strncmp(fn(),"cmp",n); flowing all over
the place.
Hence, since the version, name and config is already pre-initialized
with empty string, just dont check for invalid header in the first
place and return the empty string to the caller.
Reported-by: Brad Griffis <bgriffis@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
[trini: Correct was'nt -> wasn't typo]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/ti/common/board_detect.c')
| -rw-r--r-- | board/ti/common/board_detect.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index 13aac2f030..6e7ca9196d 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -231,9 +231,7 @@ char * __maybe_unused board_ti_get_rev(void) { struct ti_common_eeprom *ep = TI_EEPROM_DATA; - if (ep->header == TI_DEAD_EEPROM_MAGIC) - return NULL; - + /* if ep->header == TI_DEAD_EEPROM_MAGIC, this is empty already */ return ep->version; } @@ -241,9 +239,7 @@ char * __maybe_unused board_ti_get_config(void) { struct ti_common_eeprom *ep = TI_EEPROM_DATA; - if (ep->header == TI_DEAD_EEPROM_MAGIC) - return NULL; - + /* if ep->header == TI_DEAD_EEPROM_MAGIC, this is empty already */ return ep->config; } @@ -251,9 +247,7 @@ char * __maybe_unused board_ti_get_name(void) { struct ti_common_eeprom *ep = TI_EEPROM_DATA; - if (ep->header == TI_DEAD_EEPROM_MAGIC) - return NULL; - + /* if ep->header == TI_DEAD_EEPROM_MAGIC, this is empty already */ return ep->name; } |