diff options
| author | Joe Schultz <jschultz@xes-inc.com> | 2014-04-03 14:47:55 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-11-19 23:44:30 +0100 |
| commit | ff286b4678fd95286afef33e5b740a2e0d5f9983 (patch) | |
| tree | ca0673030982dffc165225a34f2e1ea355981ecf | |
| parent | 8a8f33b2f640e1e7d0486888293817f56505aa4f (diff) | |
vme_tsi148: Fix typo in tsi148_slave_get()
commit 098ced8fefe4a4e4240fa47b1ed9b00d65b6cd21 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 6783ad0d1875..b92eb181dcda 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, reg_join(vme_bound_high, vme_bound_low, &vme_bound); reg_join(pci_offset_high, pci_offset_low, &pci_offset); - *pci_base = (dma_addr_t)vme_base + pci_offset; + *pci_base = (dma_addr_t)(*vme_base + pci_offset); *enabled = 0; *aspace = 0; |