diff --git a/[refs] b/[refs]
index 0a04ccf1bfcc..3a7d6b596125 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa4e2e171385bb77b4da8b760d26dea2aa291587
+refs/heads/master: 9db2f1bec36805e57a003f7bb90e003815d96de8
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 1c01b96c9611..7650f739a81a 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1844,7 +1844,8 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
 	sky2->tx_cons = idx;
 	smp_mb();
 
-	if (tx_avail(sky2) > MAX_SKB_TX_LE + 4)
+	/* Wake unless it's detached, and called e.g. from sky2_down() */
+	if (tx_avail(sky2) > MAX_SKB_TX_LE + 4 && netif_device_present(dev))
 		netif_wake_queue(dev);
 }