summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBrett M Russ <russb@emc.com>2005-09-09 19:02:22 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 19:27:23 +0200
commit2fd9d74b35efa9823f1f7d34cb421e2b9eee9650 (patch)
treef59d67d39c13fcb5cbaf256b457926d3f78385aa /drivers
parentMerge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff)
downloadlinux-2fd9d74b35efa9823f1f7d34cb421e2b9eee9650.tar.xz
linux-2fd9d74b35efa9823f1f7d34cb421e2b9eee9650.zip
[PATCH] PCI: PCI/libata INTx bug fix
Previous INTx cleanup patch had a bug that was not caught. I found this last night during testing and can confirm that it is now 100% working. Signed-off-by: Brett Russ <russb@emc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ccff633a3948..992db89adce7 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -819,7 +819,7 @@ pci_intx(struct pci_dev *pdev, int enable)
}
if (new != pci_command) {
- pci_write_config_word(pdev, PCI_COMMAND, pci_command);
+ pci_write_config_word(pdev, PCI_COMMAND, new);
}
}