---

yaml --- r: 35189 b: refs/heads/master c: 98232f8 h: refs/heads/master i: 35187: e4c6d56 v: v3
git-mirror · Aug 29, 2006 · 7c7af71 · 7c7af71
1 parent 943747f
commit 7c7af71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3bcfbeb27a546d02af202353381ddd91ea39b87
+refs/heads/master: 98232f85ffd0efc34c462da5ee81516f7432cec2
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -531,6 +531,7 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
 		reg1 |= phy_power[port];
 
 	sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
+	sky2_pci_read32(hw, PCI_DEV_REG1);
 	udelay(100);
 }
 
@@ -766,9 +767,10 @@ static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2)
 /* Update chip's next pointer */
 static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q, u16 idx)
 {
+	q = Y2_QADDR(q, PREF_UNIT_PUT_IDX);
 	wmb();
-	sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx);
-	mmiowb();
+	sky2_write16(hw, q, idx);
+	sky2_read16(hw, q);
 }