Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283983
b: refs/heads/master
c: 6048ef7
h: refs/heads/master
i:
  283981: 5eb1582
  283979: b4cfe51
  283975: 702aaa3
  283967: d8ff424
v: v3
  • Loading branch information
Axel Lin authored and Mark Brown committed Dec 20, 2011
1 parent 8c4633a commit de69244
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0a1fe66698a641fdaf92a130131981f2c19d8f6b
refs/heads/master: 6048ef768e7bec7e1e17f48fe8d5360021928b4a
12 changes: 6 additions & 6 deletions trunk/sound/soc/codecs/alc5623.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ static const unsigned int boost_tlv[] = {
};
static const DECLARE_TLV_DB_SCALE(dig_tlv, 0, 600, 0);

static const struct snd_kcontrol_new rt5621_vol_snd_controls[] = {
static const struct snd_kcontrol_new alc5621_vol_snd_controls[] = {
SOC_DOUBLE_TLV("Speaker Playback Volume",
ALC5623_SPK_OUT_VOL, 8, 0, 31, 1, hp_tlv),
SOC_DOUBLE("Speaker Playback Switch",
Expand All @@ -110,7 +110,7 @@ static const struct snd_kcontrol_new rt5621_vol_snd_controls[] = {
ALC5623_HP_OUT_VOL, 15, 7, 1, 1),
};

static const struct snd_kcontrol_new rt5622_vol_snd_controls[] = {
static const struct snd_kcontrol_new alc5622_vol_snd_controls[] = {
SOC_DOUBLE_TLV("Speaker Playback Volume",
ALC5623_SPK_OUT_VOL, 8, 0, 31, 1, hp_tlv),
SOC_DOUBLE("Speaker Playback Switch",
Expand Down Expand Up @@ -925,12 +925,12 @@ static int alc5623_probe(struct snd_soc_codec *codec)

switch (alc5623->id) {
case 0x21:
snd_soc_add_controls(codec, rt5621_vol_snd_controls,
ARRAY_SIZE(rt5621_vol_snd_controls));
snd_soc_add_controls(codec, alc5621_vol_snd_controls,
ARRAY_SIZE(alc5621_vol_snd_controls));
break;
case 0x22:
snd_soc_add_controls(codec, rt5622_vol_snd_controls,
ARRAY_SIZE(rt5622_vol_snd_controls));
snd_soc_add_controls(codec, alc5622_vol_snd_controls,
ARRAY_SIZE(alc5622_vol_snd_controls));
break;
case 0x23:
snd_soc_add_controls(codec, alc5623_vol_snd_controls,
Expand Down

0 comments on commit de69244

Please sign in to comment.