lkml.org 
[lkml]   [2014]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 091/172] ASoC: wm8770: Fix wrong number of enum items
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit 7a6c0a58dc824523966f212c76322d47c5b0e6fe upstream.

    wm8770 codec driver defines ain_enum with a wrong number of items.

    Use SOC_ENUM_DOUBLE_DECL() macro and it's automatically fixed.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
    Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
    Acked-by: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Mark Brown <broonie@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/codecs/wm8770.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/sound/soc/codecs/wm8770.c
    +++ b/sound/soc/codecs/wm8770.c
    @@ -196,8 +196,8 @@ static const char *ain_text[] = {
    "AIN5", "AIN6", "AIN7", "AIN8"
    };

    -static const struct soc_enum ain_enum =
    - SOC_ENUM_DOUBLE(WM8770_ADCMUX, 0, 4, 8, ain_text);
    +static SOC_ENUM_DOUBLE_DECL(ain_enum,
    + WM8770_ADCMUX, 0, 4, ain_text);

    static const struct snd_kcontrol_new ain_mux =
    SOC_DAPM_ENUM("Capture Mux", ain_enum);



    \
     
     \ /
      Last update: 2014-03-05 00:42    [W:2.039 / U:4.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site