Update at modem call forwarding driver

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c
index 2807e3ed..a737defa 100644
--- a/drivers/atmodem/atmodem.c
+++ b/drivers/atmodem/atmodem.c
@@ -101,7 +101,6 @@ static void interface_exit(struct at_data *at)
 {
 	at_phonebook_exit(at->modem);
 	at_sms_exit(at->modem);
-	at_call_forwarding_exit(at->modem);
 	at_call_settings_exit(at->modem);
 	at_network_registration_exit(at->modem);
 	at_voicecall_exit(at->modem);
@@ -365,7 +364,7 @@ static void create_cb(GIOChannel *io, gboolean success, gpointer user)
 
 	at_ussd_init(at->modem);
 	at_sim_init(at->modem);
-	at_call_forwarding_init(at->modem);
+	ofono_call_forwarding_create(at->modem, "generic_at", at->parser);
 	at_call_settings_init(at->modem);
 	at_network_registration_init(at->modem);
 	at_voicecall_init(at->modem);
@@ -530,6 +529,7 @@ static int atmodem_init(void)
 	DBusConnection *conn = ofono_dbus_get_connection();
 
 	at_call_barring_init();
+	at_call_forwarding_init();
 
 	manager_init(conn);
 
@@ -542,6 +542,7 @@ static void atmodem_exit(void)
 
 	manager_exit(conn);
 
+	at_call_forwarding_exit();
 	at_call_barring_exit();
 }