You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openwrt/target/linux/layerscape/patches-5.4/801-audio-0038-MLK-17467-AS...

37 lines
1.3 KiB
Diff

This file contains ambiguous Unicode characters!

This file contains ambiguous Unicode characters that may be confused with others in your current locale. If your use case is intentional and legitimate, you can safely ignore this warning. Use the Escape button to highlight these characters.

From b22f55e1f41ebe218604f12c127d299a2c302393 Mon Sep 17 00:00:00 2001
From: Shengjiu Wang <shengjiu.wang@nxp.com>
Date: Fri, 26 Jan 2018 16:44:19 +0800
Subject: [PATCH] MLK-17467: ASoC: fsl_sai: fix typo for fsl_sai
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix build warning
sound/soc/fsl/fsl_sai.c: In function fsl_sai_trigger:
sound/soc/fsl/fsl_sai.c:736:3: warning: this while clause does not guard... [-Wmisleading-indentation]
while (tx && i < channels)
^~~~~
sound/soc/fsl/fsl_sai.c:742:4: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the while
j++;
^
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
sound/soc/fsl/fsl_sai.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -727,9 +727,8 @@ static int fsl_sai_trigger(struct snd_pc
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
- for (i = 0; tx && i < channels; i++) {
- while (tx && i < channels)
- if (sai->dataline[tx] & (1 << j)) {
+ while (tx && i < channels) {
+ if ((sai->is_dsd ? sai->dataline_dsd[tx] : sai->dataline[tx]) & (1 << j)) {
regmap_write(sai->regmap, FSL_SAI_TDR0 + j * 0x4, 0x0);
i++;
k++;