Commit b07700d4 authored by David S. Miller's avatar David S. Miller

[SPARC64]: Fix pbus->sysdata interpretation in pci_domain_nr().

parent eb40c469
...@@ -804,13 +804,11 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, ...@@ -804,13 +804,11 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
/* Return the domain nuber for this pci bus */ /* Return the domain nuber for this pci bus */
int pci_domain_nr(struct pci_bus *bus) int pci_domain_nr(struct pci_bus *pbus)
{ {
struct pcidev_cookie *cookie = bus->sysdata; struct pci_pbm_info *pbm = pbus->sysdata;
int ret; int ret;
if (cookie != NULL) {
struct pci_pbm_info *pbm = cookie->pbm;
if (pbm == NULL || pbm->parent == NULL) { if (pbm == NULL || pbm->parent == NULL) {
ret = -ENXIO; ret = -ENXIO;
} else { } else {
...@@ -821,9 +819,6 @@ int pci_domain_nr(struct pci_bus *bus) ...@@ -821,9 +819,6 @@ int pci_domain_nr(struct pci_bus *bus)
ret = ((ret << 1) + ret = ((ret << 1) +
((pbm == &pbm->parent->pbm_B) ? 1 : 0)); ((pbm == &pbm->parent->pbm_B) ? 1 : 0));
} }
} else {
ret = -ENXIO;
}
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment