From 611f37607fadcdc9908d67456f844a452ad4a87a Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 17 Jun 2012 19:11:35 -0700 Subject: [PATCH] altos: Make sure ao_storage_config is set before reading config block ao_storage_read does in fact call ao_storage_setup, but we need the value of ao_storage_config *before* calling ao_storage_read, so call ao_storage_setup first. Signed-off-by: Keith Packard --- src/core/ao_config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/ao_config.c b/src/core/ao_config.c index a4877b06..cc580d66 100644 --- a/src/core/ao_config.c +++ b/src/core/ao_config.c @@ -81,6 +81,11 @@ _ao_config_get(void) if (ao_config_loaded) return; #if HAS_EEPROM + /* Yes, I know ao_storage_read calls ao_storage_setup, + * but ao_storage_setup *also* sets ao_storage_config, which we + * need before calling ao_storage_read here + */ + ao_storage_setup(); ao_storage_read(ao_storage_config, &ao_config, sizeof (ao_config)); #endif if (ao_config.major != AO_CONFIG_MAJOR) { -- 2.30.2