diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-07-18 18:42:34 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-07-18 18:42:40 +0300 |
commit | 67ece13ffe862f9d17a144c6cd3feef88a57db13 (patch) | |
tree | ec2036681d19a9c10b2fad941eb8f58f9eafcfc8 /sound | |
parent | fa84cf094ef9667e2b91c104b0a788fd1896f482 (diff) | |
parent | 4aaf448fa9754e2d5ee188d32327b24ffc15ca4d (diff) | |
download | linux-67ece13ffe862f9d17a144c6cd3feef88a57db13.tar.xz |
Merge branch 'topic/vga_switcheroo' into for-next
Pull the vga_switcheroo audio client fix.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index daedf662b940..19198312e142 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1319,15 +1319,16 @@ static const struct vga_switcheroo_client_ops azx_vs_ops = { static int register_vga_switcheroo(struct azx *chip) { struct hda_intel *hda = container_of(chip, struct hda_intel, chip); + struct pci_dev *p; int err; if (!hda->use_vga_switcheroo) return 0; - /* FIXME: currently only handling DIS controller - * is there any machine with two switchable HDMI audio controllers? - */ - err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops, - VGA_SWITCHEROO_DIS); + + p = get_bound_vga(chip->pci); + err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops, p); + pci_dev_put(p); + if (err < 0) return err; hda->vga_switcheroo_registered = 1; |