lkml.org 
[lkml]   [2019]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 069/193] ASoC: fsl_sai: Update is_slave_mode with correct value
    Date
    [ Upstream commit ddb351145a967ee791a0fb0156852ec2fcb746ba ]

    is_slave_mode defaults to false because sai structure
    that contains it is kzalloc'ed.

    Anyhow, if we decide to set the following configuration
    SAI slave -> SAI master, is_slave_mode will remain set on true
    although SAI being master it should be set to false.

    Fix this by updating is_slave_mode for each call of
    fsl_sai_set_dai_fmt.

    Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
    Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/fsl/fsl_sai.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
    index 18e5ce81527d2..c1c733b573a7f 100644
    --- a/sound/soc/fsl/fsl_sai.c
    +++ b/sound/soc/fsl/fsl_sai.c
    @@ -274,12 +274,14 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
    case SND_SOC_DAIFMT_CBS_CFS:
    val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
    val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
    + sai->is_slave_mode = false;
    break;
    case SND_SOC_DAIFMT_CBM_CFM:
    sai->is_slave_mode = true;
    break;
    case SND_SOC_DAIFMT_CBS_CFM:
    val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
    + sai->is_slave_mode = false;
    break;
    case SND_SOC_DAIFMT_CBM_CFS:
    val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-30 05:36    [W:4.139 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site