redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

MLK-13608: mfd: mxc-hdmi-core: fix the dependency of alsa sound 

When remove sound card build config, there will be error

drivers/built-in.o: In function `mxc_hdmi_register_audio':
vf610_adc.c:(.text+0xd64f8): undefined reference to `_snd_pcm_stream_lock_irqsave'
vf610_adc.c:(.text+0xd6518): undefined reference to `snd_pcm_stream_unlock_irqrestore'
drivers/built-in.o: In function `mxc_hdmi_abort_stream':
vf610_adc.c:(.text+0xd65a4): undefined reference to `_snd_pcm_stream_lock_irqsave'
vf610_adc.c:(.text+0xd65d0): undefined reference to `snd_pcm_stream_unlock_irqrestore'
make: *** [vmlinux] Error 1

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
pull/10/head
Shengjiu Wang 2016-12-14 13:02:24 +08:00 committed by Jason Liu
parent 957da032f1
commit 38fb0e7a0e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mfd/mxc-hdmi-core.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011-2015 Freescale Semiconductor, Inc.
* Copyright (C) 2011-2016 Freescale Semiconductor, Inc.
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
@ -100,6 +100,7 @@ unsigned int hdmi_set_blank_state(unsigned int state)
}
EXPORT_SYMBOL(hdmi_set_blank_state);
#ifdef CONFIG_SND_SOC_IMX_HDMI_DMA
static void hdmi_audio_abort_stream(struct snd_pcm_substream *substream)
{
unsigned long flags;
@ -130,6 +131,13 @@ int mxc_hdmi_abort_stream(void)
return 0;
}
EXPORT_SYMBOL(mxc_hdmi_abort_stream);
#else
int mxc_hdmi_abort_stream(void)
{
return 0;
}
EXPORT_SYMBOL(mxc_hdmi_abort_stream);
#endif
int check_hdmi_state(void)
{
@ -148,6 +156,7 @@ int check_hdmi_state(void)
}
EXPORT_SYMBOL(check_hdmi_state);
#ifdef CONFIG_SND_SOC_IMX_HDMI_DMA
int mxc_hdmi_register_audio(struct snd_pcm_substream *substream)
{
unsigned long flags, flags1;
@ -175,6 +184,7 @@ int mxc_hdmi_register_audio(struct snd_pcm_substream *substream)
return ret;
}
EXPORT_SYMBOL(mxc_hdmi_register_audio);
#endif
void mxc_hdmi_unregister_audio(struct snd_pcm_substream *substream)
{