git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alpha/PCI: Call iomem_is_exclusive() for IORESOURCE_MEM, but not IORESOURCE_IO
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
pci-sysfs.c
diff --git
a/arch/alpha/kernel/pci-sysfs.c
b/arch/alpha/kernel/pci-sysfs.c
index
53649c7
..
cb63d52
100644
(file)
--- a/
arch/alpha/kernel/pci-sysfs.c
+++ b/
arch/alpha/kernel/pci-sysfs.c
@@
-78,10
+78,10
@@
static int pci_mmap_resource(struct kobject *kobj,
if (i >= PCI_ROM_RESOURCE)
return -ENODEV;
if (i >= PCI_ROM_RESOURCE)
return -ENODEV;
- if (
!__pci_mmap_fits(pdev, i, vma, sparse
))
+ if (
res->flags & IORESOURCE_MEM && iomem_is_exclusive(res->start
))
return -EINVAL;
return -EINVAL;
- if (
iomem_is_exclusive(res->start
))
+ if (
!__pci_mmap_fits(pdev, i, vma, sparse
))
return -EINVAL;
pcibios_resource_to_bus(pdev, &bar, res);
return -EINVAL;
pcibios_resource_to_bus(pdev, &bar, res);