Merge 66d7da19bc
into 6d345395f3
This commit is contained in:
commit
565df21fa2
@ -78,7 +78,7 @@ diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
|||||||
index e84378684643..0bfa7199c974 100644
|
index e84378684643..0bfa7199c974 100644
|
||||||
--- a/drivers/pci/quirks.c
|
--- a/drivers/pci/quirks.c
|
||||||
+++ b/drivers/pci/quirks.c
|
+++ b/drivers/pci/quirks.c
|
||||||
@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
|
@@ -194,6 +194,105 @@ static int __init pci_apply_final_quirks(void)
|
||||||
}
|
}
|
||||||
fs_initcall_sync(pci_apply_final_quirks);
|
fs_initcall_sync(pci_apply_final_quirks);
|
||||||
|
|
||||||
@ -156,8 +156,7 @@ index e84378684643..0bfa7199c974 100644
|
|||||||
+ int i;
|
+ int i;
|
||||||
+
|
+
|
||||||
+ /* Never override ACS for legacy devices or devices with ACS caps */
|
+ /* Never override ACS for legacy devices or devices with ACS caps */
|
||||||
+ if (!pci_is_pcie(dev) ||
|
+ if (!pci_is_pcie(dev))
|
||||||
+ pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ACS))
|
|
||||||
+ return -ENOTTY;
|
+ return -ENOTTY;
|
||||||
+
|
+
|
||||||
+ for (i = 0; i < max_acs_id; i++)
|
+ for (i = 0; i < max_acs_id; i++)
|
||||||
|
Loading…
Reference in New Issue
Block a user