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

torvalds · torvalds · commit d464572a80da · 2018-11-08T17:45:42.000-06:00
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
diff --git 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
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,9 @@ int vga_switcheroo_register_audio_client(struct pci_dev *pdev,`
`380`	`380`	`mutex_unlock(&vgasr_mutex);`
`381`	`381`	`return -EINVAL;`
`382`	`382`	`}`
	`383`	`+ /* notify if GPU has been already bound */`
	`384`	`+ if (ops->gpu_bound)`
	`385`	`+ ops->gpu_bound(pdev, id);`
`383`	`386`	`}`
`384`	`387`	`mutex_unlock(&vgasr_mutex);`
`385`	`388`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,`
`58`	`58`	`removefunc = false;`
`59`	`59`	`}`
`60`	`60`	`if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0 &&`
`61`		`- snd_hda_gen_add_micmute_led(codec,`
`62`		`- update_tpacpi_micmute) > 0)`
	`61`	`+ !snd_hda_gen_add_micmute_led(codec,`
	`62`	`+ update_tpacpi_micmute))`
`63`	`63`	`removefunc = false;`
`64`	`64`	`}`
`65`	`65`