]> code.delx.au - pulseaudio/commitdiff
alsa: skip eld initialization if hctl_handle is NULL
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>
Tue, 2 Apr 2013 09:27:38 +0000 (11:27 +0200)
committerTanu Kaskinen <tanuk@iki.fi>
Tue, 2 Apr 2013 15:55:53 +0000 (18:55 +0300)
Due to a misconfiguration on my side my hdmi card didn't load with
snd-hda-codec-hdmi but through the fallback mechanism. Pulseaudio
would crash during early because hctl_handle was null, so skip
init_eld_ctls when hctl_handle is null to prevent a crash.

Thanks to David Henningsson for helping me find the underlying issue.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
src/modules/alsa/module-alsa-card.c

index 3b96ceac0cc63025a2f792db98936e6a4c0b7128..2529c0dfc5bbbf586265ad5b5b9da0fc0cc7cc6d 100644 (file)
@@ -437,6 +437,9 @@ static void init_eld_ctls(struct userdata *u) {
     void *state;
     pa_device_port *port;
 
+    if (!u->hctl_handle)
+        return;
+
     PA_HASHMAP_FOREACH(port, u->card->ports, state) {
         pa_alsa_port_data *data = PA_DEVICE_PORT_DATA(port);
         snd_hctl_elem_t* hctl_elem;