summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisael Lopez Cruz2013-11-25 14:16:32 -0600
committerGerrit Code Review2013-11-25 15:22:22 -0600
commit0e9b0a6d2cc67b7822dd625f60070cfe75b6558b (patch)
tree8189a4f6ae28b65971b8da6ae8888b2ea7a2e60d
parent138871a89802e980411a9409f643a62740749b7c (diff)
downloaddevice-ti-common-open-0e9b0a6d2cc67b7822dd625f60070cfe75b6558b.tar.gz
device-ti-common-open-0e9b0a6d2cc67b7822dd625f60070cfe75b6558b.tar.xz
device-ti-common-open-0e9b0a6d2cc67b7822dd625f60070cfe75b6558b.zip
audio: hdmi: Add OMAP_ENHANCEMENT to card name query
Commit c98083eb doesn't completely enclose all symbols that are OMAP_ENHANCEMENT dependent. Change-Id: I083f8a309423639e61845b68db4028d421b94e39 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
-rw-r--r--audio/hw/hdmi_audio_hw.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/audio/hw/hdmi_audio_hw.c b/audio/hw/hdmi_audio_hw.c
index 2e8cb49..37c3441 100644
--- a/audio/hw/hdmi_audio_hw.c
+++ b/audio/hw/hdmi_audio_hw.c
@@ -298,15 +298,11 @@ static int hdmi_out_find_card(void)
298 char name[256] = ""; 298 char name[256] = "";
299 int card = 0; 299 int card = 0;
300 int found = 0; 300 int found = 0;
301 int ret;
302 301
302#ifdef OMAP_ENHANCEMENT
303 do { 303 do {
304 /* return an error after last valid card */ 304 /* return an error after last valid card */
305#ifdef OMAP_ENHANCEMENT 305 int ret = mixer_get_card_name(card, name, sizeof(name));
306 ret = mixer_get_card_name(card, name, sizeof(name));
307#else
308 ret = -ENOTSUP;
309#endif
310 if (ret) 306 if (ret)
311 break; 307 break;
312 308
@@ -316,6 +312,7 @@ static int hdmi_out_find_card(void)
316 break; 312 break;
317 } 313 }
318 } while (card++ < MAX_CARD_COUNT); 314 } while (card++ < MAX_CARD_COUNT);
315#endif
319 316
320 /* Use default card number if not found */ 317 /* Use default card number if not found */
321 if (!found) 318 if (!found)