diff options
-rw-r--r-- | drivers/vme/bridges/vme_tsi148.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c index 6b03be715005..e64e4208de2b 100644 --- a/drivers/vme/bridges/vme_tsi148.c +++ b/drivers/vme/bridges/vme_tsi148.c | |||
@@ -910,11 +910,15 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, | |||
910 | unsigned long long pci_bound, vme_offset, pci_base; | 910 | unsigned long long pci_bound, vme_offset, pci_base; |
911 | struct vme_bridge *tsi148_bridge; | 911 | struct vme_bridge *tsi148_bridge; |
912 | struct tsi148_driver *bridge; | 912 | struct tsi148_driver *bridge; |
913 | struct pci_bus_region region; | ||
914 | struct pci_dev *pdev; | ||
913 | 915 | ||
914 | tsi148_bridge = image->parent; | 916 | tsi148_bridge = image->parent; |
915 | 917 | ||
916 | bridge = tsi148_bridge->driver_priv; | 918 | bridge = tsi148_bridge->driver_priv; |
917 | 919 | ||
920 | pdev = container_of(tsi148_bridge->parent, struct pci_dev, dev); | ||
921 | |||
918 | /* Verify input data */ | 922 | /* Verify input data */ |
919 | if (vme_base & 0xFFFF) { | 923 | if (vme_base & 0xFFFF) { |
920 | dev_err(tsi148_bridge->parent, "Invalid VME Window " | 924 | dev_err(tsi148_bridge->parent, "Invalid VME Window " |
@@ -949,7 +953,9 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, | |||
949 | pci_bound = 0; | 953 | pci_bound = 0; |
950 | vme_offset = 0; | 954 | vme_offset = 0; |
951 | } else { | 955 | } else { |
952 | pci_base = (unsigned long long)image->bus_resource.start; | 956 | pcibios_resource_to_bus(pdev->bus, ®ion, |
957 | &image->bus_resource); | ||
958 | pci_base = region.start; | ||
953 | 959 | ||
954 | /* | 960 | /* |
955 | * Bound address is a valid address for the window, adjust | 961 | * Bound address is a valid address for the window, adjust |