---

yaml --- r: 174823 b: refs/heads/master c: 04b55c4 h: refs/heads/master i: 174821: 5a6c6e0 174819: e08a311 174815: b4c7581 v: v3
git-mirror · Dec 4, 2009 · c88da19 · c88da19
1 parent 19ecda0
commit c88da19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb965401fd2afa26629b244e7bb2e48a117dc238
+refs/heads/master: 04b55c4732780381410e52db0e9bfb7661f2b4b3
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
@@ -2140,7 +2140,7 @@ static int pcie_flr(struct pci_dev *dev, int probe)
 	int i;
 	int pos;
 	u32 cap;
-	u16 status;
+	u16 status, control;
 
 	pos = pci_pcie_cap(dev);
 	if (!pos)
@@ -2167,8 +2167,10 @@ static int pcie_flr(struct pci_dev *dev, int probe)
 			"proceeding with reset anyway\n");
 
 clear:
-	pci_write_config_word(dev, pos + PCI_EXP_DEVCTL,
-				PCI_EXP_DEVCTL_BCR_FLR);
+	pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &control);
+	control |= PCI_EXP_DEVCTL_BCR_FLR;
+	pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, control);
+
 	msleep(100);
 
 	return 0;