diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-19 15:58:24 -0500 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:04 +0100 |
commit | 94bd776756d122719536033a7629b3afa52a284c (patch) | |
tree | 79153ba6f4524445981ee8ded592e9aabf49ec33 | |
parent | 38906d3df81688bb423e38b644d28c9ab7ddfcb1 (diff) | |
download | kernel_samsung_smdk4412-94bd776756d122719536033a7629b3afa52a284c.zip kernel_samsung_smdk4412-94bd776756d122719536033a7629b3afa52a284c.tar.gz kernel_samsung_smdk4412-94bd776756d122719536033a7629b3afa52a284c.tar.bz2 |
PCI: Fix TI816X class code quirk
commit d1541dc977d376406f4584d8eb055488655c98ec upstream.
In fixup_ti816x_class(), we assigned "class = PCI_CLASS_MULTIMEDIA_VIDEO".
But PCI_CLASS_MULTIMEDIA_VIDEO is only the two-byte base class/sub-class
and needs to be shifted to make space for the low-order interface byte.
Shift PCI_CLASS_MULTIMEDIA_VIDEO to set the correct class code.
Fixes: 63c4408074cb ("PCI: Add quirk for setting valid class for TI816X Endpoint")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Hemant Pedanekar <hemantp@ti.com>
[bwh: Backported to 3.2: the class check is done in this function as there
is no DECLARE_PCI_FIXUP_CLASS_EARLY()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | drivers/pci/quirks.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 481b184..0def0b1 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2875,8 +2875,9 @@ static void __devinit fixup_ti816x_class(struct pci_dev* dev) { /* TI 816x devices do not have class code set when in PCIe boot mode */ if (dev->class == PCI_CLASS_NOT_DEFINED) { - dev_info(&dev->dev, "Setting PCI class for 816x PCIe device\n"); - dev->class = PCI_CLASS_MULTIMEDIA_VIDEO; + dev->class = PCI_CLASS_MULTIMEDIA_VIDEO << 8; + dev_info(&dev->dev, "PCI class overridden (%#08x -> %#08x)\n", + PCI_CLASS_NOT_DEFINED, dev->class); } } DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_TI, 0xb800, fixup_ti816x_class); |