diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-23 03:09:53 +0000 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 11:13:24 -0800 |
| commit | ef1bba28bfe68ef3c0488feeaabd3e8bc523130c (patch) | |
| tree | 609c6ff2f6767894206f6a26e999c90f23b5c8b9 /drivers/net/sfc | |
| parent | 6a479079c07211bf348ac8a79754f26bea258f26 (diff) | |
| download | linux-ef1bba28bfe68ef3c0488feeaabd3e8bc523130c.tar.gz linux-ef1bba28bfe68ef3c0488feeaabd3e8bc523130c.tar.bz2 linux-ef1bba28bfe68ef3c0488feeaabd3e8bc523130c.zip | |
net: sfc: Use pci_clear_master() to disable bus mastering
pci_disable_device() disables many features, like MSI-X, which we
never reenable in efx_reset(). Further, calls to pci_enable_device()
and pci_disable_device() must be matched since the nesting count was
introduced, so switch to using pci_clear_master() instead.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/net/sfc')
| -rw-r--r-- | drivers/net/sfc/falcon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 6884dc8c1f82..5b9f2d9cc4ed 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -1403,9 +1403,9 @@ static irqreturn_t falcon_fatal_interrupt(struct efx_nic *efx) } /* Disable both devices */ - pci_disable_device(efx->pci_dev); + pci_clear_master(efx->pci_dev); if (FALCON_IS_DUAL_FUNC(efx)) - pci_disable_device(nic_data->pci_dev2); + pci_clear_master(nic_data->pci_dev2); falcon_disable_interrupts(efx); if (++n_int_errors < FALCON_MAX_INT_ERRORS) { |