From a36617a7b1f3d03d6274af780080f3090d22b0ca Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 23 Feb 2012 23:46:58 -0800
Subject: [PATCH] --- yaml --- r: 294779 b: refs/heads/master c:
 40c96236bdab60b5879a277270ee209b87fc846f h: refs/heads/master i:   294777:
 504ba8420f1e24b909e7809998a735b557458e78   294775:
 210c541faf5add076307331d31e52ab96864b7de v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/pci/quirks.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 064fbb85bd1a..6e6f7f612517 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c5b28e26d3621e188288293ccfe82ea1177499f
+refs/heads/master: 40c96236bdab60b5879a277270ee209b87fc846f
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index 91733a29a28a..e198589d0990 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/drivers/pci/quirks.c
@@ -2822,12 +2822,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors);
 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_info(&dev->dev, "Setting PCI class for 816x PCIe device\n");
+	dev->class = PCI_CLASS_MULTIMEDIA_VIDEO;
 }
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_TI, 0xb800, fixup_ti816x_class);
+DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_TI, 0xb800,
+				 PCI_CLASS_NOT_DEFINED, 0, fixup_ti816x_class);
 
 /* Some PCIe devices do not work reliably with the claimed maximum
  * payload size supported.