diff options
| author | Mark Brown <broonie@kernel.org> | 2025-03-14 05:31:06 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-03-14 05:31:06 +0300 |
| commit | e0afd7d370c6f577c1dacb1512e18048eabf322e (patch) | |
| tree | ebe7e98755569509f132d61d1deabac38544e5fc /include | |
| parent | f0066c8d1d3298e9f9d136a365139bac733e84c5 (diff) | |
| parent | de74ec718e0788e1998eb7289ad07970e27cae27 (diff) | |
| download | linux-e0afd7d370c6f577c1dacb1512e18048eabf322e.tar.xz | |
ASoC: Merge up fixes
Merge the for-6.14 to resolve conflicts with simple-card-utils.c due to
parallel delveopment.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index de1abad06a9b..d73fe26de166 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1223,7 +1223,10 @@ void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd); /* mixer control */ struct soc_mixer_control { - int min, max, platform_max; + /* Minimum and maximum specified as written to the hardware */ + int min, max; + /* Limited maximum value specified as presented through the control */ + int platform_max; int reg, rreg; unsigned int shift, rshift; u32 num_channels; |