From b1c86302f10140301755935a0da2ba6759cc04d3 Mon Sep 17 00:00:00 2001
From: Carolyn Wyborny <carolyn.wyborny@intel.com>
Date: Wed, 16 May 2012 01:46:00 +0000
Subject: [PATCH] --- yaml --- r: 314528 b: refs/heads/master c:
 d3eef8c8a033a5ee56ab5d923068eb8cd5d53887 h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/net/ethernet/intel/igb/igb_ptp.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a96c1887cf62..b8f30e997c0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f00b0da776fda1abc481578e3932a668f603d72d
+refs/heads/master: d3eef8c8a033a5ee56ab5d923068eb8cd5d53887
diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_ptp.c b/trunk/drivers/net/ethernet/intel/igb/igb_ptp.c
index d5ee7fa50723..c846ea9131a3 100644
--- a/trunk/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/trunk/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -330,7 +330,17 @@ void igb_ptp_init(struct igb_adapter *adapter)
 
 void igb_ptp_remove(struct igb_adapter *adapter)
 {
-	cancel_delayed_work_sync(&adapter->overflow_work);
+	switch (adapter->hw.mac.type) {
+	case e1000_i211:
+	case e1000_i210:
+	case e1000_i350:
+	case e1000_82580:
+	case e1000_82576:
+		cancel_delayed_work_sync(&adapter->overflow_work);
+		break;
+	default:
+		return;
+	}
 
 	if (adapter->ptp_clock) {
 		ptp_clock_unregister(adapter->ptp_clock);