diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-05-29 21:50:27 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-05-29 21:50:27 +0200 |
commit | 52593de4c11fb24c83d8036ba34706881aab5e3d (patch) | |
tree | fa67eb3900f64031431389052b76404b425d7117 /sound/soc/codecs/wm8350.c | |
parent | d21921215af2fe33190a3b5b166b145e607e537d (diff) | |
parent | 274a24c16fa97a1fc67437b191274db2286c7ac3 (diff) |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8350.c')
-rw-r--r-- | sound/soc/codecs/wm8350.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 8ae20208e7b..0221ca79b3a 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -426,8 +426,8 @@ static const struct soc_enum wm8350_enum[] = { SOC_ENUM_SINGLE(WM8350_INPUT_MIXER_VOLUME, 15, 2, wm8350_lr), }; -static DECLARE_TLV_DB_LINEAR(pre_amp_tlv, -1200, 3525); -static DECLARE_TLV_DB_LINEAR(out_pga_tlv, -5700, 600); +static DECLARE_TLV_DB_SCALE(pre_amp_tlv, -1200, 3525, 0); +static DECLARE_TLV_DB_SCALE(out_pga_tlv, -5700, 600, 0); static DECLARE_TLV_DB_SCALE(dac_pcm_tlv, -7163, 36, 1); static DECLARE_TLV_DB_SCALE(adc_pcm_tlv, -12700, 50, 1); static DECLARE_TLV_DB_SCALE(out_mix_tlv, -1500, 300, 1); |