]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
net: sfc: Use pci_clear_master() to disable bus mastering
authorBen Hutchings <bhutchings@solarflare.com>
Tue, 23 Dec 2008 03:09:53 +0000 (03:09 +0000)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 7 Jan 2009 19:13:24 +0000 (11:13 -0800)
commitef1bba28bfe68ef3c0488feeaabd3e8bc523130c
tree609c6ff2f6767894206f6a26e999c90f23b5c8b9
parent6a479079c07211bf348ac8a79754f26bea258f26
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>
drivers/net/sfc/falcon.c