---

yaml --- r: 111831 b: refs/heads/master c: 0a62f1a h: refs/heads/master i: 111829: 0a06862 111827: 11cc07c 111823: 5474e04 v: v3
git-mirror · Sep 24, 2008 · 599605d · 599605d
1 parent 667fd63
commit 599605d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d0680fd6235e0aa5baf14a8f1ff85eff9dc1fb3
+refs/heads/master: 0a62f1a681006719c226a682dbcfb4358c8b3d28
diff --git a/trunk/drivers/net/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c
@@ -1374,10 +1374,11 @@ static irqreturn_t falcon_fatal_interrupt(struct efx_nic *efx)
 			EFX_OWORD_FMT "\n", EFX_OWORD_VAL(reg));
 	}
 
-	/* Disable DMA bus mastering on both devices */
+	/* Disable both devices */
 	pci_disable_device(efx->pci_dev);
 	if (FALCON_IS_DUAL_FUNC(efx))
 		pci_disable_device(nic_data->pci_dev2);
+	falcon_disable_interrupts(efx);
 
 	if (++n_int_errors < FALCON_MAX_INT_ERRORS) {
 		EFX_ERR(efx, "SYSTEM ERROR - reset scheduled\n");