From 822de11e728a7021ac970cff832bce98fdafe45f Mon Sep 17 00:00:00 2001 From: Anthony Merlino Date: Sun, 25 Jun 2017 20:01:16 -0400 Subject: [PATCH] ieee802154: Minor fix to setup logic for i8sak --- wireless/ieee802154/i8sak/i8sak_main.c | 27 +++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/wireless/ieee802154/i8sak/i8sak_main.c b/wireless/ieee802154/i8sak/i8sak_main.c index 789bdbcce..872e3c5e5 100644 --- a/wireless/ieee802154/i8sak/i8sak_main.c +++ b/wireless/ieee802154/i8sak/i8sak_main.c @@ -528,23 +528,24 @@ static void i8sak_switch_instance(FAR char *devname) } sq_addlast((FAR sq_entry_t *)i8sak, &g_i8sak_instances); + + /* Update our "sticky" i8sak instance. Must come before call to setup so that + * the shared active global i8sak is correct. + */ + + g_activei8sak = i8sak; + + if (i8sak_setup(i8sak, devname) < 0) + { + exit(EXIT_FAILURE); + } } - - /* Update our "sticky" i8sak instance. Must come before call to setup so that - * the shared active global i8sak is correct. - */ - - g_activei8sak = i8sak; - - if (!g_activei8sak_set) + else { - g_activei8sak_set = true; + g_activei8sak = i8sak; } - if (i8sak_setup(i8sak, devname) < 0) - { - exit(EXIT_FAILURE); - } + g_activei8sak_set = true; } static int i8sak_setup(FAR struct i8sak_s *i8sak, FAR const char *devname)