Skip to content

Commit 6206b2e

Browse files
crojewsk-intelbroonie
authored andcommitted
ASoC: Intel: avs: nau8825: Adjust clock control
Internal clock shall be adjusted also in cases when DAPM event other than 'ON' is triggered. Signed-off-by: Cezary Rojewski <[email protected]> Signed-off-by: Amadeusz Sławiński <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 933de2d commit 6206b2e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

sound/soc/intel/avs/boards/nau8825.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ avs_nau8825_clock_control(struct snd_soc_dapm_widget *w, struct snd_kcontrol *co
3333
return -EINVAL;
3434
}
3535

36-
if (!SND_SOC_DAPM_EVENT_ON(event)) {
36+
if (SND_SOC_DAPM_EVENT_ON(event))
37+
ret = snd_soc_dai_set_sysclk(codec_dai, NAU8825_CLK_MCLK, 24000000,
38+
SND_SOC_CLOCK_IN);
39+
else
3740
ret = snd_soc_dai_set_sysclk(codec_dai, NAU8825_CLK_INTERNAL, 0, SND_SOC_CLOCK_IN);
38-
if (ret < 0) {
39-
dev_err(card->dev, "set sysclk err = %d\n", ret);
40-
return ret;
41-
}
42-
}
41+
if (ret < 0)
42+
dev_err(card->dev, "Set sysclk failed: %d\n", ret);
4343

44-
return 0;
44+
return ret;
4545
}
4646

4747
static const struct snd_kcontrol_new card_controls[] = {

0 commit comments

Comments
 (0)