Skip to content

Commit

Permalink
ASoC: wm2200: Correct types of mixer texts and values
Browse files Browse the repository at this point in the history
The core expects "const char * const" and "unsigned int" for enum
controls, the mixer control definitions in wm2200 use "const char *"
and "int".  This patch corrects the type of these arrays.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Charles Keepax authored and Mark Brown committed Nov 10, 2016
1 parent 1001354 commit 4090d63
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/codecs/wm2200.c
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ static DECLARE_TLV_DB_SCALE(in_tlv, -6300, 100, 0);
static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);
static DECLARE_TLV_DB_SCALE(out_tlv, -6400, 100, 0);

static const char *wm2200_mixer_texts[] = {
static const char * const wm2200_mixer_texts[] = {
"None",
"Tone Generator",
"AEC Loopback",
Expand Down Expand Up @@ -1033,7 +1033,7 @@ static const char *wm2200_mixer_texts[] = {
"DSP2.6",
};

static int wm2200_mixer_values[] = {
static unsigned int wm2200_mixer_values[] = {
0x00,
0x04, /* Tone */
0x08, /* AEC */
Expand Down

0 comments on commit 4090d63

Please sign in to comment.