aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2007-09-17 19:30:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-09-17 19:30:42 -0400
commitcd799e167394282ba76bb48ccf398283752e9037 (patch)
treef576f69b215258f64f8acf795ea95e9b527a6bd9
parent98e899b06e05082f0d5161a56385c592be447940 (diff)
parent6d29c381d7d771070b8bf74662e9680e09cb40f9 (diff)
downloadwireless-legacy-wireless-dev-2007-09-24.tar.gz
Merge branch 'p54' into everythingwireless-dev-2007-09-24
-rw-r--r--drivers/net/wireless/p54pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54pci.c b/drivers/net/wireless/p54pci.c
index 4b825ff9e190d..114cbaf0f7ef3 100644
--- a/drivers/net/wireless/p54pci.c
+++ b/drivers/net/wireless/p54pci.c
@@ -528,7 +528,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
}
pci_set_master(pdev);
- pci_set_mwi(pdev);
+ pci_try_set_mwi(pdev);
pci_write_config_byte(pdev, 0x40, 0);
pci_write_config_byte(pdev, 0x41, 0);