aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSatoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>2006-09-12 10:24:14 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-09-26 17:43:54 -0700
commitaa4f63cad4f70a52adbabb66ac6c8b6072910fdf (patch)
tree5e8e6da36c56516922d2087265fd513299fce7df /arch
parent600812ecead0da2e7b6f9e5f5aad68b1ad8ae581 (diff)
downloadkernel_samsung_tuna-aa4f63cad4f70a52adbabb66ac6c8b6072910fdf.zip
kernel_samsung_tuna-aa4f63cad4f70a52adbabb66ac6c8b6072910fdf.tar.gz
kernel_samsung_tuna-aa4f63cad4f70a52adbabb66ac6c8b6072910fdf.tar.bz2
IA64: PCI: dont disable irq which is not enabled
This patch prevents pcibios_disable_device() from disabling interrupts of devices which is not enabled. Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com> Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/pci/pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 60b45e7..15c7c67 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -562,7 +562,8 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
void
pcibios_disable_device (struct pci_dev *dev)
{
- acpi_pci_irq_disable(dev);
+ if (dev->is_enabled)
+ acpi_pci_irq_disable(dev);
}
void