1 files changed, 22 insertions, 6 deletions

diff --git a/audio/hdmi_audio_hw.c b/audio/hdmi_audio_hw.c
index cd44aec..18b9f6f 100644
--- a/audio/hdmi_audio_hw.c
+++ b/audio/hdmi_audio_hw.c
@@ -297,12 +297,28 @@ int hdmi_out_set_volume(struct audio_stream_out *stream, float left, float right
 
 static int hdmi_out_find_card(void)
 {
-    /* XXX TODO: Dynamically detect HDMI card
-     * If another audio device is present at boot time (e.g.
-     * USB Audio device) then it might take the card #1
-     * position, putting HDMI on card #2.
-     */
-    return 1;
+    char name[256] = "";
+    int card = 0;
+    int found = 0;
+
+    do {
+        /* return an error after last valid card */
+        int ret = mixer_get_card_name(card, name, sizeof(name));
+        if (ret)
+            break;
+
+        if (strstr(name, "HDMI") || strstr(name, "hdmi")) {
+            TRACEM("HDMI card '%s' found at %d", name, card);
+            found = 1;
+            break;
+        }
+    } while (card++ < MAX_CARD_COUNT);
+
+    /* Use default card number if not found */
+    if (!found)
+        card = 1;
+
+    return card;
 }
 
 static int hdmi_out_open_pcm(hdmi_out_t *out)