summaryrefslogtreecommitdiff
path: root/profiles/sap
diff options
context:
space:
mode:
authorSzymon Janc <szymon.janc@tieto.com>2012-11-23 11:09:11 +0100
committerJohan Hedberg <johan.hedberg@intel.com>2012-12-11 07:41:07 +0200
commit630d78a5b9eed4c5f3a219c93cc000ca8d3187d7 (patch)
tree67a54cf9aedf8d04fc1b8cc7f9fd0add56820438 /profiles/sap
parentd555301c5fc369c45cdc7c09a6de85f6f5f9e549 (diff)
downloadbluez-630d78a5b9eed4c5f3a219c93cc000ca8d3187d7.tar.gz
sap-u8500: Fix build errors due to unaligned memory access
This fix following compilation error on ARM. CC profiles/sap/sap-u8500.o profiles/sap/sap-u8500.c: In function recv_card_status: profiles/sap/sap-u8500.c:323:16: error: cast increases required alignment of target type [-Werror=cast-align] profiles/sap/sap-u8500.c: In function recv_response: profiles/sap/sap-u8500.c:423:12: error: cast increases required alignment of target type [-Werror=cast-align] cc1: all warnings being treated as errors
Diffstat (limited to 'profiles/sap')
-rw-r--r--profiles/sap/sap-u8500.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/profiles/sap/sap-u8500.c b/profiles/sap/sap-u8500.c
index f07209dbb..b1aee57a6 100644
--- a/profiles/sap/sap-u8500.c
+++ b/profiles/sap/sap-u8500.c
@@ -313,16 +313,16 @@ static void recv_status(uint32_t status)
static void recv_card_status(uint32_t status, uint8_t *param)
{
- uint32_t *card_status;
+ uint32_t card_status;
uint8_t result;
uint8_t iccrs;
if (status != STE_STATUS_OK)
return;
- card_status = (uint32_t *)param;
+ memcpy(&card_status, param, sizeof(card_status));
- if (get_sap_reader_status(*card_status, &iccrs) < 0)
+ if (get_sap_reader_status(card_status, &iccrs) < 0)
result = SAP_RESULT_ERROR_NO_REASON;
else
result = get_sap_result(STE_GET_STATUS_MSG, status);
@@ -420,7 +420,7 @@ static void recv_response(struct ste_message *msg)
}
param = msg->payload;
- status = *(uint32_t *)param;
+ memcpy(&status, param, sizeof(status));
param += sizeof(status);
SAP_VDBG("status 0x%x", status);