Merge tag 'sound-4.20-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (d464572a) · Commits · 戴 / test

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

drivers/gpu/vga/vga_switcheroo.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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);

sound/pci/hda/thinkpad_helper.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

Admin message