diff options
author | Takashi Iwai <tiwai@suse.de> | 2022-05-23 08:48:16 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2022-05-23 08:48:27 +0300 |
commit | 1212fa1b482ea09c19aed29001465799e85ea6c3 (patch) | |
tree | ca70b299e420fbbfab8cb9780584f66b0652f8a8 /sound/hda/hdac_i915.c | |
parent | 03a8b0df757f1beb21ba1626e23ca7412e48b525 (diff) | |
parent | 7b0efea4baf02f5e2f89e5f9b75ef891571b45f1 (diff) | |
download | linux-1212fa1b482ea09c19aed29001465799e85ea6c3.tar.xz |
Merge branch 'for-linus' into for-next
Merge for 5.18-rc1
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda/hdac_i915.c')
-rw-r--r-- | sound/hda/hdac_i915.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 48b8ed752b69..3f35972e1cf7 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -127,11 +127,10 @@ static int i915_gfx_present(struct pci_dev *hdac_pci) display_dev = pci_get_class(class, display_dev); if (display_dev && display_dev->vendor == PCI_VENDOR_ID_INTEL && - connectivity_check(display_dev, hdac_pci)) + connectivity_check(display_dev, hdac_pci)) { + pci_dev_put(display_dev); match = true; - - pci_dev_put(display_dev); - + } } while (!match && display_dev); return match; |