From 1d56ce51dfbdc5b3ece78a4e3b4a68882e964b84 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 26 May 2009 17:36:42 -0500 Subject: [PATCH] Fixup the initialization / destruction order --- drivers/atmodem/atmodem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c index 25cecd30..8f14bc01 100644 --- a/drivers/atmodem/atmodem.c +++ b/drivers/atmodem/atmodem.c @@ -107,9 +107,9 @@ static void manager_free(gpointer user) at_call_settings_exit(at->modem); at_network_registration_exit(at->modem); at_voicecall_exit(at->modem); - at_ussd_exit(at->modem); at_call_meter_exit(at->modem); at_call_barring_exit(at->modem); + at_ussd_exit(at->modem); at_sim_exit(at->modem); ofono_modem_unregister(at->modem); @@ -338,6 +338,7 @@ static void create_cb(GIOChannel *io, gboolean success, gpointer user) ofono_modem_set_userdata(at->modem, at); at_ussd_init(at->modem); + at_sim_init(at->modem); at_call_forwarding_init(at->modem); at_call_settings_init(at->modem); at_call_waiting_init(at->modem); @@ -345,7 +346,6 @@ static void create_cb(GIOChannel *io, gboolean success, gpointer user) at_voicecall_init(at->modem); at_call_meter_init(at->modem); at_call_barring_init(at->modem); - at_sim_init(at->modem); at->io = io; at->driver = g_strdup(driver);