diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-18 23:48:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-18 23:48:44 -0800 |
| commit | 1515754ed3753f4060c4a773499fe949ec1e5738 (patch) | |
| tree | b8a97d4e1054b6813d39276b4f273fdeb31051ff /drivers/soc | |
| parent | 53d9fa23b772dfab73c3f747791d226d18f1927b (diff) | |
| parent | dbdcdb21535d4b476f82f26e16af0b0c297e47d2 (diff) | |
Merge "defconfig: sdm660: Enable G-Link SPI Transport driver in 32 bit"
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/glink_spi_xprt.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/soc/qcom/glink_spi_xprt.c b/drivers/soc/qcom/glink_spi_xprt.c index 47c66c892736..5de6e7eac7ea 100644 --- a/drivers/soc/qcom/glink_spi_xprt.c +++ b/drivers/soc/qcom/glink_spi_xprt.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -789,9 +789,9 @@ static void process_rx_cmd(struct edge_info *einfo, offset += sizeof(*intents); einfo->xprt_if.glink_core_if_ptr-> rx_cmd_remote_rx_intent_put_cookie( - &einfo->xprt_if, cmd->param1, - intents->id, intents->size, - (void *)(intents->addr)); + &einfo->xprt_if, cmd->param1, + intents->id, intents->size, + (void *)(uintptr_t)(intents->addr)); } break; @@ -821,9 +821,10 @@ static void process_rx_cmd(struct edge_info *einfo, case TRACER_PKT_CONT_CMD: rx_descp = (struct rx_desc *)(rx_data + offset); offset += sizeof(*rx_descp); - process_rx_data(einfo, cmd->id, cmd->param1, - cmd->param2, (void *)rx_descp->addr, - rx_descp->size, rx_descp->size_left); + process_rx_data(einfo, cmd->id, cmd->param1, + cmd->param2, + (void *)(uintptr_t)(rx_descp->addr), + rx_descp->size, rx_descp->size_left); break; case TX_SHORT_DATA_CMD: |