diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-13 13:01:27 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-13 13:01:27 -0500 |
| commit | 1d72e71d4542d2eff16c74242f7e5dfca38fb49a (patch) | |
| tree | dfdf37c552b98b9b82e1037be5037748dad3841c /arch/x86/kernel | |
| parent | 6c52f51ccbb371d9161a1081560df7d31df4c495 (diff) | |
| parent | 09296c0bbbc107586a43e9ca7c7214153bbbefa6 (diff) | |
Merge branch 'pci/yijing-dev_is_pci' into next
* pci/yijing-dev_is_pci:
alpha/PCI: Use dev_is_pci() to identify PCI devices
arm/PCI: Use dev_is_pci() to identify PCI devices
arm/PCI: Use dev_is_pci() to identify PCI devices
parisc/PCI: Use dev_is_pci() to identify PCI devices
sparc/PCI: Use dev_is_pci() to identify PCI devices
ia64/PCI: Use dev_is_pci() to identify PCI devices
x86/PCI: Use dev_is_pci() to identify PCI devices
PCI: Use dev_is_pci() to identify PCI devices
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 6c0b43bd024b..d359d0fffa50 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -1034,9 +1034,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, | |||
| 1034 | 1034 | ||
| 1035 | if (!acpi_ioapic) | 1035 | if (!acpi_ioapic) |
| 1036 | return 0; | 1036 | return 0; |
| 1037 | if (!dev) | 1037 | if (!dev || !dev_is_pci(dev)) |
| 1038 | return 0; | ||
| 1039 | if (dev->bus != &pci_bus_type) | ||
| 1040 | return 0; | 1038 | return 0; |
| 1041 | 1039 | ||
| 1042 | pdev = to_pci_dev(dev); | 1040 | pdev = to_pci_dev(dev); |