libpayload: fix compiler warning for first_cmos_entry()

[coreboot.git] / payloads / libpayload / drivers / options.c

diff --git a/payloads/libpayload/drivers/options.c b/payloads/libpayload/drivers/options.c
index 10d165ecc713382a4c2c036b9e5049a79c12eaef..73316c1de6db86f425b69cd5d37f4aa8d36530a7 100644 (file)
--- a/payloads/libpayload/drivers/options.c
+++ b/payloads/libpayload/drivers/options.c
@@ -155,7 +155,7 @@ static int set_cmos_value(const struct nvram_accessor *nvram, u32 bitnum, u32 le
 static struct cb_cmos_entries *lookup_cmos_entry(struct cb_cmos_option_table *option_table, char *name)
 {
        struct cb_cmos_entries *cmos_entry;
-       int len = strnlen(name, CMOS_MAX_NAME_LENGTH);
+       int len = name ? strnlen(name, CMOS_MAX_NAME_LENGTH) : 0;
 
        /* cmos entries are located right after the option table */
 
@@ -173,7 +173,7 @@ static struct cb_cmos_entries *lookup_cmos_entry(struct cb_cmos_option_table *op
 
 struct cb_cmos_entries *first_cmos_entry(struct cb_cmos_option_table *option_table)
 {
-       return lookup_cmos_entry(option_table, "");
+       return lookup_cmos_entry(option_table, NULL);
 }
 
 struct cb_cmos_entries *next_cmos_entry(struct cb_cmos_entries *cmos_entry)
@@ -292,7 +292,7 @@ int get_option_as_string(const struct nvram_accessor *nvram, struct cb_cmos_opti
                        *dest = strdup((const char*)cmos_enum->text);
                        break;
                default: /* fail */
-                       return 1;
+                       ret = 1;
        }
        free(raw);
        return ret;
@@ -309,7 +309,7 @@ int set_option_from_string(const struct nvram_accessor *nvram, struct cb_cmos_op
        switch (cmos_entry->config) {
                case 'h':
                        /* only works on little endian */
-                       raw = malloc(8);
+                       raw = malloc(sizeof(u64));
                        *(u64*)raw = strtoull(value, NULL, 0);
                        break;
                case 's':