diff options
| author | Mark Brown <broonie@kernel.org> | 2020-01-23 12:36:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-23 12:36:45 +0000 |
| commit | a7196caf83ea9e9b56c5c8c95fbfe0d45acec46b (patch) | |
| tree | d9147ac16e1af83463bad4e45b233bc8e51f2e0e /sound/soc/intel/boards/skl_nau88l25_max98357a.c | |
| parent | 20230620b44510ce968a719a1d6ee7483583178d (diff) | |
| parent | d8e2e0d2491e78f3f7b451c3a93ba29950efe2cf (diff) | |
| download | talos-op-linux-a7196caf83ea9e9b56c5c8c95fbfe0d45acec46b.tar.gz talos-op-linux-a7196caf83ea9e9b56c5c8c95fbfe0d45acec46b.zip | |
Merge branch 'asoc-5.6' into asoc-next
Diffstat (limited to 'sound/soc/intel/boards/skl_nau88l25_max98357a.c')
| -rw-r--r-- | sound/soc/intel/boards/skl_nau88l25_max98357a.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c index 3ce8efbeed12..e6de3b28d840 100644 --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c @@ -139,13 +139,13 @@ static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, { struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); - struct snd_interval *channels = hw_param_interval(params, + struct snd_interval *chan = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); /* The ADSP will covert the FE rate to 48k, stereo */ rate->min = rate->max = 48000; - channels->min = channels->max = 2; + chan->min = chan->max = 2; /* set SSP0 to 24 bit */ snd_mask_none(fmt); @@ -315,13 +315,13 @@ static const struct snd_soc_ops skylake_nau8825_ops = { static int skylake_dmic_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { - struct snd_interval *channels = hw_param_interval(params, + struct snd_interval *chan = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); if (params_channels(params) == 2 || DMIC_CH(dmic_constraints) == 2) - channels->min = channels->max = 2; + chan->min = chan->max = 2; else - channels->min = channels->max = 4; + chan->min = chan->max = 4; return 0; } |
