diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-02-10 17:20:53 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-10 17:20:53 +0000 |
| commit | 513b6165ee16f5106b5048b6852939dcdc6d8ae2 (patch) | |
| tree | b493bf88f0abd19fca48be121b62710b57dda747 /drivers | |
| parent | c8e0f950c1fcb3e76a6d5ec80c3bb8f99fcd941f (diff) | |
| parent | 466bb285c6985027c75a230e39f2ae246fd07971 (diff) | |
| download | platform_external_arm-trusted-firmware-513b6165ee16f5106b5048b6852939dcdc6d8ae2.tar.gz platform_external_arm-trusted-firmware-513b6165ee16f5106b5048b6852939dcdc6d8ae2.tar.bz2 platform_external_arm-trusted-firmware-513b6165ee16f5106b5048b6852939dcdc6d8ae2.zip | |
Merge "coverity: Fix MISRA null pointer violations" into integration
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/console/multi_console.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/console/multi_console.c b/drivers/console/multi_console.c index 215f49517..0665f202f 100644 --- a/drivers/console/multi_console.c +++ b/drivers/console/multi_console.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -90,7 +90,7 @@ int console_putc(int c) console_t *console; for (console = console_list; console != NULL; console = console->next) - if ((console->flags & console_state) && console->putc) { + if ((console->flags & console_state) && (console->putc != NULL)) { int ret = do_putc(c, console); if ((err == ERROR_NO_VALID_CONSOLE) || (ret < err)) err = ret; @@ -107,7 +107,7 @@ int console_getc(void) do { /* Keep polling while at least one console works correctly. */ for (console = console_list; console != NULL; console = console->next) - if ((console->flags & console_state) && console->getc) { + if ((console->flags & console_state) && (console->getc != NULL)) { int ret = console->getc(console); if (ret >= 0) return ret; @@ -125,7 +125,7 @@ int console_flush(void) console_t *console; for (console = console_list; console != NULL; console = console->next) - if ((console->flags & console_state) && console->flush) { + if ((console->flags & console_state) && (console->flush != NULL)) { int ret = console->flush(console); if ((err == ERROR_NO_VALID_CONSOLE) || (ret < err)) err = ret; |