Commit 7560931f authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Evaluate gpio_led hints at the right moment

The hints regarding the mute-LED must be evaluated during the codec
parsing.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8c7dd890
...@@ -4232,13 +4232,6 @@ static void stac_store_hints(struct hda_codec *codec) ...@@ -4232,13 +4232,6 @@ static void stac_store_hints(struct hda_codec *codec)
val = snd_hda_get_bool_hint(codec, "eapd_switch"); val = snd_hda_get_bool_hint(codec, "eapd_switch");
if (val >= 0) if (val >= 0)
spec->eapd_switch = val; spec->eapd_switch = val;
get_int_hint(codec, "gpio_led_polarity", &spec->gpio_led_polarity);
if (get_int_hint(codec, "gpio_led", &spec->gpio_led)) {
spec->gpio_mask |= spec->gpio_led;
spec->gpio_dir |= spec->gpio_led;
if (spec->gpio_led_polarity)
spec->gpio_data |= spec->gpio_led;
}
} }
static void stac_issue_unsol_events(struct hda_codec *codec, int num_pins, static void stac_issue_unsol_events(struct hda_codec *codec, int num_pins,
...@@ -4843,6 +4836,11 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity) ...@@ -4843,6 +4836,11 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)
struct sigmatel_spec *spec = codec->spec; struct sigmatel_spec *spec = codec->spec;
const struct dmi_device *dev = NULL; const struct dmi_device *dev = NULL;
if (get_int_hint(codec, "gpio_led", &spec->gpio_led)) {
get_int_hint(codec, "gpio_led_polarity",
&spec->gpio_led_polarity);
return 1;
}
if ((codec->subsystem_id >> 16) == PCI_VENDOR_ID_HP) { if ((codec->subsystem_id >> 16) == PCI_VENDOR_ID_HP) {
while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING,
NULL, dev))) { NULL, dev))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment