This partly reverts commit 804770590556be5c922c9fb7e779e72805911e57. Checking for CONFIG_NVVAR is not required in nvvar_device_dispatch() as nv_device is not used in this function (only the address is compared). After fixing this, globalvar_simple_set() works again if CONFIG_NVVAR is disabled. Fixes: 8047705905 ("globalvar: fix crash if CONFIG_NVVAR is not set") Signed-off-by: Christian Eggers <ceggers@xxxxxxx> --- common/globalvar.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/globalvar.c b/common/globalvar.c index 1bea7425d..cec0a9cc4 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -141,9 +141,6 @@ static int nvvar_device_dispatch(const char *name, struct device_d **dev, const char *dot; int dotpos; - if (!IS_ENABLED(CONFIG_NVVAR)) - return -ENOSYS; - *dev = NULL; if (strncmp(name, "dev.", 4)) -- Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox