From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Szymon Janc To: CC: Szymon Janc Subject: [RFC v4 16/18] sap-u8500: Fix compile error due to unaligned memory access Date: Tue, 4 Sep 2012 16:41:35 +0200 Message-ID: <1346769697-9930-17-git-send-email-szymon.janc@tieto.com> In-Reply-To: <1346769697-9930-1-git-send-email-szymon.janc@tieto.com> References: <1346769697-9930-1-git-send-email-szymon.janc@tieto.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-bluetooth-owner@vger.kernel.org List-ID: 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 --- profiles/sap/sap-u8500.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/profiles/sap/sap-u8500.c b/profiles/sap/sap-u8500.c index f07209d..8938c84 100644 --- a/profiles/sap/sap-u8500.c +++ b/profiles/sap/sap-u8500.c @@ -32,6 +32,8 @@ #include #include +#include + #include "log.h" #include "sap.h" @@ -313,16 +315,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; + card_status = bt_get_unaligned(param, uint32_t); - 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 +422,7 @@ static void recv_response(struct ste_message *msg) } param = msg->payload; - status = *(uint32_t *)param; + status = bt_get_unaligned(param, uint32_t); param += sizeof(status); SAP_VDBG("status 0x%x", status); -- 1.7.9.5