diff options
| -rw-r--r-- | arch/sparc/kernel/iommu.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c index 070ed141aac7..76663b019eb5 100644 --- a/arch/sparc/kernel/iommu.c +++ b/arch/sparc/kernel/iommu.c | |||
| @@ -854,7 +854,7 @@ int dma_supported(struct device *dev, u64 device_mask) | |||
| 854 | return 1; | 854 | return 1; |
| 855 | 855 | ||
| 856 | #ifdef CONFIG_PCI | 856 | #ifdef CONFIG_PCI |
| 857 | if (dev->bus == &pci_bus_type) | 857 | if (dev_is_pci(dev)) |
| 858 | return pci64_dma_supported(to_pci_dev(dev), device_mask); | 858 | return pci64_dma_supported(to_pci_dev(dev), device_mask); |
| 859 | #endif | 859 | #endif |
| 860 | 860 | ||
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 2096468de9b2..e7e215dfa866 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c | |||
| @@ -666,10 +666,9 @@ EXPORT_SYMBOL(dma_ops); | |||
| 666 | */ | 666 | */ |
| 667 | int dma_supported(struct device *dev, u64 mask) | 667 | int dma_supported(struct device *dev, u64 mask) |
| 668 | { | 668 | { |
| 669 | #ifdef CONFIG_PCI | 669 | if (dev_is_pci(dev)) |
| 670 | if (dev->bus == &pci_bus_type) | ||
| 671 | return 1; | 670 | return 1; |
| 672 | #endif | 671 | |
| 673 | return 0; | 672 | return 0; |
| 674 | } | 673 | } |
| 675 | EXPORT_SYMBOL(dma_supported); | 674 | EXPORT_SYMBOL(dma_supported); |
