[pulseaudio-discuss] [PATCH v1 8/8] bluetooth: Set to off instead of failing module load

Mikel Astiz mikel.astiz.oss at gmail.com
Thu Oct 18 01:27:22 PDT 2012


From: Mikel Astiz <mikel.astiz at bmw-carit.de>

If the profile setup fails during module load, the fallback should be
setting the profile to off, exactly as it is done in card_set_profile().
---
 src/modules/bluetooth/module-bluetooth-device.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 3375886..f01eb57 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -2640,14 +2640,22 @@ int pa__init(pa_module* m) {
 
     if (u->profile != PROFILE_OFF)
         if (init_profile(u) < 0)
-            goto fail;
+            goto off;
 
     if (u->sink || u->source)
         if (start_thread(u) < 0)
-            goto fail;
+            goto off;
 
     return 0;
 
+off:
+    stop_thread(u);
+
+    if (pa_card_set_profile(u->card, "off", FALSE) >= 0)
+        return 0;
+
+    pa_log_debug("Failed to switch profile to off");
+
 fail:
 
     pa__done(m);
-- 
1.7.11.7



More information about the pulseaudio-discuss mailing list