1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index fb544d6d29f6..2b4b1ea158cf 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2961,17 +2961,19 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
 static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
                           struct pci_fixup *end)
 {
-        while (f < end) {
-                if ((f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) &&
-                    (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {
+        for (; f < end; f++)
+                if ((f->class == (u32) (dev->class >> f->class_shift) ||
+                     f->class == (u32) PCI_ANY_ID) &&
+                    (f->vendor == dev->vendor ||
+                     f->vendor == (u16) PCI_ANY_ID) &&
+                    (f->device == dev->device ||
+                     f->device == (u16) PCI_ANY_ID)) {
                         dev_dbg(&dev->dev, "calling %pF\n", f->hook);
                         if (initcall_debug)
                                 do_one_fixup_debug(f->hook, dev);
                         else
                                 f->hook(dev);
                 }
-                f++;
-        }
 }
 
 extern struct pci_fixup __start_pci_fixups_early[];