Commit d464572a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'sound-4.20-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "Two small regression fixes for HD-audio: one about vga_switcheroo and
  runtime PM, and another about Oops on some Thinkpads"

* tag 'sound-4.20-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix incorrect clearance of thinkpad_acpi hooks
  vga_switcheroo: Fix missing gpu_bound call at audio client registration
parents b00d2092 5e93a125
...@@ -380,6 +380,9 @@ int vga_switcheroo_register_audio_client(struct pci_dev *pdev, ...@@ -380,6 +380,9 @@ int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
mutex_unlock(&vgasr_mutex); mutex_unlock(&vgasr_mutex);
return -EINVAL; return -EINVAL;
} }
/* notify if GPU has been already bound */
if (ops->gpu_bound)
ops->gpu_bound(pdev, id);
} }
mutex_unlock(&vgasr_mutex); mutex_unlock(&vgasr_mutex);
......
...@@ -58,8 +58,8 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec, ...@@ -58,8 +58,8 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,
removefunc = false; removefunc = false;
} }
if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0 && if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0 &&
snd_hda_gen_add_micmute_led(codec, !snd_hda_gen_add_micmute_led(codec,
update_tpacpi_micmute) > 0) update_tpacpi_micmute))
removefunc = false; removefunc = false;
} }
......
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