From f8a177478c1b79e369ecc65501d9d15ff573339f Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 8 May 2017 20:08:02 +0200 Subject: globalvar: Fix value of new globalvar when nvvar exists When a new globalvar with a value is created and the corresponding nvvar exists, then the globalvar gets the value of the nvvar, not from the newly assigned value as expected. nv quux=foo; global quux=bar; echo ${global.quux} Should give "bar", not "foo". Fix this. Reported-by: Ian Abbott Signed-off-by: Sascha Hauer --- common/globalvar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/globalvar.c b/common/globalvar.c index c48e7df067..c528b24062 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -403,11 +403,11 @@ int globalvar_add_simple(const char *name, const char *value) return PTR_ERR(param); } + globalvar_nv_sync(name); + if (value) dev_set_param(&global_device, name, value); - globalvar_nv_sync(name); - return 0; } -- cgit v1.2.3