diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-02 12:02:09 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-02 12:02:09 +0100 |
commit | 0ce8428ba9ea13098b828d0881e28368a108709c (patch) | |
tree | 12cbe5d9c27319b8a18ac9fc9cb44e3c5f35408c /sound/soc/codecs/rt5640.c | |
parent | fba0d7066524ab7b8ccf60e7e95981d10ed008b0 (diff) | |
parent | 8c0f55100478649e3c0133684aa4aebab77ce10f (diff) | |
download | blackbird-op-linux-0ce8428ba9ea13098b828d0881e28368a108709c.tar.gz blackbird-op-linux-0ce8428ba9ea13098b828d0881e28368a108709c.zip |
Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel
ASoC: Fixes for v4.6
This is a fairly large collection of fixes but almost all driver
specific ones, especially to the new Intel drivers which have had a lot
of recent development. The one core fix is a change to the debugfs code
to avoid crashes in some relatively unusual configurations.
Diffstat (limited to 'sound/soc/codecs/rt5640.c')
-rw-r--r-- | sound/soc/codecs/rt5640.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index e8b5ba04417a..09e8988bbb2d 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -359,7 +359,7 @@ static const DECLARE_TLV_DB_RANGE(bst_tlv, /* Interface data select */ static const char * const rt5640_data_select[] = { - "Normal", "left copy to right", "right copy to left", "Swap"}; + "Normal", "Swap", "left copy to right", "right copy to left"}; static SOC_ENUM_SINGLE_DECL(rt5640_if1_dac_enum, RT5640_DIG_INF_DATA, RT5640_IF1_DAC_SEL_SFT, rt5640_data_select); |