diff options
| author | akpm <akpm@linux-foundation.org> | 2022-06-27 10:31:44 -0700 |
|---|---|---|
| committer | akpm <akpm@linux-foundation.org> | 2022-06-27 10:31:44 -0700 |
| commit | ee56c3e8eec166f4e4a2ca842b7804d14f3a0208 (patch) | |
| tree | 3bcee4a6090d681b7bbb49d1946c95798f166159 /sound/hda/hdac_i915.c | |
| parent | 00c9d5632277b21ba8802e26c27254cd9d0dfa13 (diff) | |
| parent | 03c765b0e3b4cb5063276b086c76f7a612856a9a (diff) | |
| download | lwn-ee56c3e8eec166f4e4a2ca842b7804d14f3a0208.tar.gz lwn-ee56c3e8eec166f4e4a2ca842b7804d14f3a0208.zip | |
Merge branch 'master' into mm-nonmm-stable
Diffstat (limited to 'sound/hda/hdac_i915.c')
| -rw-r--r-- | sound/hda/hdac_i915.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 3f35972e1cf7..161a9711cd63 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -119,21 +119,18 @@ static int i915_component_master_match(struct device *dev, int subcomponent, /* check whether Intel graphics is present and reachable */ static int i915_gfx_present(struct pci_dev *hdac_pci) { - unsigned int class = PCI_BASE_CLASS_DISPLAY << 16; struct pci_dev *display_dev = NULL; - bool match = false; - do { - display_dev = pci_get_class(class, display_dev); - - if (display_dev && display_dev->vendor == PCI_VENDOR_ID_INTEL && + for_each_pci_dev(display_dev) { + if (display_dev->vendor == PCI_VENDOR_ID_INTEL && + (display_dev->class >> 16) == PCI_BASE_CLASS_DISPLAY && connectivity_check(display_dev, hdac_pci)) { pci_dev_put(display_dev); - match = true; + return true; } - } while (!match && display_dev); + } - return match; + return false; } /** |