Messages in this thread Patch in this message | | | Date | Thu, 08 Nov 2018 17:05:20 +0100 | From | Takashi Iwai <> | Subject | [GIT PULL] sound fixes for 4.20-rc2 |
| |
Linus,
please pull sound fixes for v4.20-rc2 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.20-rc2
The topmost commit is 5e93a125f521efd00d71af31c2a301f3d46af48c
----------------------------------------------------------------
sound fixes for 4.20-rc2
Two small regression fixes for HD-audio: one about vga_switcheroo and runtime PM, and another about Oops on some Thinkpads.
----------------------------------------------------------------
Takashi Iwai (2): vga_switcheroo: Fix missing gpu_bound call at audio client registration ALSA: hda - Fix incorrect clearance of thinkpad_acpi hooks
--- drivers/gpu/vga/vga_switcheroo.c | 3 +++ sound/pci/hda/thinkpad_helper.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index cf2a18571d48..a132c37d7334 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -380,6 +380,9 @@ int vga_switcheroo_register_audio_client(struct pci_dev *pdev, mutex_unlock(&vgasr_mutex); return -EINVAL; } + /* notify if GPU has been already bound */ + if (ops->gpu_bound) + ops->gpu_bound(pdev, id); } mutex_unlock(&vgasr_mutex); diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c index 97f49b751e6e..568575b72f2f 100644 --- a/sound/pci/hda/thinkpad_helper.c +++ b/sound/pci/hda/thinkpad_helper.c @@ -58,8 +58,8 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec, removefunc = false; } if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0 && - snd_hda_gen_add_micmute_led(codec, - update_tpacpi_micmute) > 0) + !snd_hda_gen_add_micmute_led(codec, + update_tpacpi_micmute)) removefunc = false; }
| |