1 files changed, 1 insertions, 8 deletions
diff --git a/audio/main.c b/audio/main.c
index a7c93201..4da85a29 100644
--- a/audio/main.c
+++ b/audio/main.c
@@ -131,16 +131,11 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (audio_init(conn) < 0) {
+	if (audio_init(conn, disable_hfp, sco_hci) < 0) {
 		error("Audio init failed!");
 		exit(1);
 	}
 
-	if (gateway_init(conn, disable_hfp, sco_hci) < 0) {
-		error("Headset initialization failed!");
-		exit(1);
-	}
-
 	if (argc > 1 && !strcmp(argv[1], "-s"))
 		register_external_service(conn, "audio", "Audio service", "");
 
@@ -148,8 +143,6 @@ int main(int argc, char *argv[])
 
 	audio_exit();
 
-	gateway_exit();
-
 	unix_exit();
 
 	dbus_connection_unref(conn);