---

yaml --- r: 184031 b: refs/heads/master c: 8b05543 h: refs/heads/master i: 184029: 78bf3b0 184027: b217a95 184023: 77337d2 184015: 9bf085b 183999: 2968f94 v: v3
git-mirror · Feb 13, 2010 · 7a0dece · 7a0dece
1 parent 4c718a1
commit 7a0dece
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a63374631e7192a64648ecc6672619a7abf9ebcd
+refs/heads/master: 8b05543129a5f216e08625e947a16b844bc4766d
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -3128,7 +3128,7 @@ static void sky2_reset(struct sky2_hw *hw)
 		/* check if PSMv2 was running before */
 		reg = sky2_pci_read16(hw, PSM_CONFIG_REG3);
 		if (reg & PCI_EXP_LNKCTL_ASPMC) {
-			int cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+			cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
 			/* restore the PCIe Link Control register */
 			sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg);
 		}