[rtems commit] bsp/riscv: Fix use of uninitialized integer

Sebastian Huber sebh at rtems.org
Thu Nov 14 10:49:23 UTC 2019


Module:    rtems
Branch:    master
Commit:    e9ae74369d8fd4e22998893f276472654b650504
Changeset: http://git.rtems.org/rtems/commit/?id=e9ae74369d8fd4e22998893f276472654b650504

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Nov 14 11:15:19 2019 +0100

bsp/riscv: Fix use of uninitialized integer

---

 bsps/riscv/riscv/console/console-config.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/bsps/riscv/riscv/console/console-config.c b/bsps/riscv/riscv/console/console-config.c
index 9a8195d..0e82624 100644
--- a/bsps/riscv/riscv/console/console-config.c
+++ b/bsps/riscv/riscv/console/console-config.c
@@ -161,7 +161,6 @@ static void riscv_console_probe(void)
       ns16550_context *ctx;
       fdt32_t *val;
       int len;
-      int reg_shift;
 
       ctx = &ns16550_instances[ns16550_devices];
       ctx->initial_baud = BSP_CONSOLE_BAUD;
@@ -169,11 +168,7 @@ static void riscv_console_probe(void)
       /* Get register shift property of the UART device */
       val = (fdt32_t *) fdt_getprop(fdt, node, "reg-shift", &len);
 
-      if (val) {
-        reg_shift = fdt32_to_cpu(val[0]);
-      }
-
-      if (reg_shift == 2) {
+      if (val != NULL && fdt32_to_cpu(val[0]) == 2) {
         ctx->get_reg = riscv_console_get_reg_32;
         ctx->set_reg = riscv_console_set_reg_32;
       } else {



More information about the vc mailing list