diff --git a/[refs] b/[refs]
index fafc38c7d038..def0546e437a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d6ab58da0465c42f34d9d4e7d91510278183c80
+refs/heads/master: 2ec3de26d2dc666159b79a8b9394fa00b6f414ae
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index cec1b1746ae0..756d4b4f0a9f 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -8199,6 +8199,11 @@ static pci_ers_result_t bnx2_io_error_detected(struct pci_dev *pdev,
 	rtnl_lock();
 	netif_device_detach(dev);
 
+	if (state == pci_channel_io_perm_failure) {
+		rtnl_unlock();
+		return PCI_ERS_RESULT_DISCONNECT;
+	}
+
 	if (netif_running(dev)) {
 		bnx2_netif_stop(bp);
 		del_timer_sync(&bp->timer);