Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 321002
b: refs/heads/master
c: a3e1997
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai committed Jul 26, 2012
1 parent 433b285 commit c2e6c0e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 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: bc733d495267a23ef8660220d696c6e549ce30b3
refs/heads/master: a3e199732b8e2b272e82cc1ccc49c35239ed6c5a
10 changes: 9 additions & 1 deletion trunk/sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ enum {
STAC_92HD83XXX_HP_cNB11_INTQUAD,
STAC_HP_DV7_4000,
STAC_HP_ZEPHYR,
STAC_92HD83XXX_HP_LED,
STAC_92HD83XXX_MODELS
};

Expand Down Expand Up @@ -1675,6 +1676,7 @@ static const char * const stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
[STAC_92HD83XXX_HP_cNB11_INTQUAD] = "hp_cNB11_intquad",
[STAC_HP_DV7_4000] = "hp-dv7-4000",
[STAC_HP_ZEPHYR] = "hp-zephyr",
[STAC_92HD83XXX_HP_LED] = "hp-led",
};

static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
Expand Down Expand Up @@ -1729,6 +1731,8 @@ static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
"HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3561,
"HP", STAC_HP_ZEPHYR),
SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3660,
"HP Mini", STAC_92HD83XXX_HP_LED),
{} /* terminator */
};

Expand Down Expand Up @@ -5507,6 +5511,7 @@ static void stac92hd8x_fill_auto_spec(struct hda_codec *codec)
static int patch_stac92hd83xxx(struct hda_codec *codec)
{
struct sigmatel_spec *spec;
int default_polarity = -1; /* no default cfg */
int err;

spec = kzalloc(sizeof(*spec), GFP_KERNEL);
Expand Down Expand Up @@ -5555,9 +5560,12 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
case STAC_HP_ZEPHYR:
spec->init = stac92hd83xxx_hp_zephyr_init;
break;
case STAC_92HD83XXX_HP_LED:
default_polarity = 1;
break;
}

if (find_mute_led_cfg(codec, -1/*no default cfg*/))
if (find_mute_led_cfg(codec, default_polarity))
snd_printd("mute LED gpio %d polarity %d\n",
spec->gpio_led,
spec->gpio_led_polarity);
Expand Down

0 comments on commit c2e6c0e

Please sign in to comment.