diff options
| -rw-r--r-- | sound/soc/codecs/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/rt5677.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 8349f982a586..ef2c70e77d91 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -525,7 +525,7 @@ config SND_SOC_RT5677 | |||
| 525 | 525 | ||
| 526 | config SND_SOC_RT5677_SPI | 526 | config SND_SOC_RT5677_SPI |
| 527 | tristate | 527 | tristate |
| 528 | default SND_SOC_RT5677 | 528 | default SND_SOC_RT5677 && SPI |
| 529 | 529 | ||
| 530 | #Freescale sgtl5000 codec | 530 | #Freescale sgtl5000 codec |
| 531 | config SND_SOC_SGTL5000 | 531 | config SND_SOC_SGTL5000 |
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 88de759fb7fc..75d2d73be545 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c | |||
| @@ -702,6 +702,9 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on) | |||
| 702 | static bool activity; | 702 | static bool activity; |
| 703 | int ret; | 703 | int ret; |
| 704 | 704 | ||
| 705 | if (!IS_ENABLED(CONFIG_SND_SOC_RT5677_SPI)) | ||
| 706 | return -ENXIO; | ||
| 707 | |||
| 705 | if (on && !activity) { | 708 | if (on && !activity) { |
| 706 | activity = true; | 709 | activity = true; |
| 707 | 710 | ||
