diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-08 17:45:42 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-08 17:45:42 -0600 |
| commit | d464572a80da40e44a1810d85ea451a4b225cf6a (patch) | |
| tree | 94b464d314f16a634b44159a7a11a4fb4eec88b5 | |
| parent | Merge tag 'compiler-attributes-for-linus-v4.20-rc2' of https://github.com/ojeda/linux (diff) | |
| parent | ALSA: hda - Fix incorrect clearance of thinkpad_acpi hooks (diff) | |
| download | linux-dev-d464572a80da40e44a1810d85ea451a4b225cf6a.tar.xz linux-dev-d464572a80da40e44a1810d85ea451a4b225cf6a.zip | |
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
| -rw-r--r-- | drivers/gpu/vga/vga_switcheroo.c | 3 | ||||
| -rw-r--r-- | 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; } |