diff options
author | Joe Schultz <jschultz@xes-inc.com> | 2014-04-03 15:47:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-16 17:08:37 -0400 |
commit | 098ced8fefe4a4e4240fa47b1ed9b00d65b6cd21 (patch) | |
tree | f75b93b89324683cb3de073e53799ec0420c3a3b /drivers/vme | |
parent | 18d7f891bcc7e49f2900215f17a861ccec34b138 (diff) |
vme_tsi148: Fix typo in tsi148_slave_get()
This patch corrects a typo where "vme_base" was used instead of
"*vme_base". The typo resulted in an incorrect value being returned
to userspace (via vme_user).
It also removes the following compile warning on some platforms:
warning: cast from pointer to integer of different size
[asierra: commit title/log rewording]
Signed-off-by: Joe Schultz <jschultz@xes-inc.com>
Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/vme')
-rw-r--r-- | drivers/vme/bridges/vme_tsi148.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c index 06990c6a1a69..6b03be715005 100644 --- a/drivers/vme/bridges/vme_tsi148.c +++ b/drivers/vme/bridges/vme_tsi148.c | |||
@@ -741,7 +741,7 @@ static int tsi148_slave_get(struct vme_slave_resource *image, int *enabled, | |||
741 | reg_join(vme_bound_high, vme_bound_low, &vme_bound); | 741 | reg_join(vme_bound_high, vme_bound_low, &vme_bound); |
742 | reg_join(pci_offset_high, pci_offset_low, &pci_offset); | 742 | reg_join(pci_offset_high, pci_offset_low, &pci_offset); |
743 | 743 | ||
744 | *pci_base = (dma_addr_t)vme_base + pci_offset; | 744 | *pci_base = (dma_addr_t)(*vme_base + pci_offset); |
745 | 745 | ||
746 | *enabled = 0; | 746 | *enabled = 0; |
747 | *aspace = 0; | 747 | *aspace = 0; |