From 599605d9bf2cc30eeab55cf23c226caa59f13908 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 1 Sep 2008 12:50:14 +0100 Subject: [PATCH] --- yaml --- r: 111831 b: refs/heads/master c: 0a62f1a681006719c226a682dbcfb4358c8b3d28 h: refs/heads/master i: 111829: 0a06862f7e27ae6f88ec7b68890b0d1a6295a7b9 111827: 11cc07c9287f4c174217baf567ad84a5ffb66cac 111823: 5474e0448ae936bc93819214d52975475b4ff333 v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/falcon.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 77616b7c7f5f..dfa458022dc7 100644 --- 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 index 3a5289fe8d1d..d30c938d0fbf 100644 --- 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");