--- linux-2.6.17.orig/drivers/net/sky2.c	2006-07-03 21:36:07.000000000 +0200
+++ linux-2.6.17/drivers/net/sky2.c	2006-07-09 13:39:49.000000000 +0200
@@ -181,8 +182,10 @@
 {
 	u16 v;
 
-	if (__gm_phy_read(hw, port, reg, &v) != 0)
+	if (__gm_phy_read(hw, port, reg, &v) != 0) {
 		printk(KERN_WARNING PFX "%s: phy read timeout\n", hw->dev[port]->name);
+		WARN_ON(1);
+	}
 	return v;
 }
 
@@ -1679,12 +1682,12 @@
 	u16 istatus, phystat;
 
 	spin_lock(&sky2->phy_lock);
-	istatus = gm_phy_read(hw, port, PHY_MARV_INT_STAT);
-	phystat = gm_phy_read(hw, port, PHY_MARV_PHY_STAT);
-
 	if (!netif_running(dev))
 		goto out;
 
+	istatus = gm_phy_read(hw, port, PHY_MARV_INT_STAT);
+	phystat = gm_phy_read(hw, port, PHY_MARV_PHY_STAT);
+
 	if (netif_msg_intr(sky2))
 		printk(KERN_INFO PFX "%s: phy interrupt status 0x%x 0x%x\n",
 		       sky2->netdev->name, istatus, phystat);