[RFC v4 12/18] avrcp: Fix compilation errors due to unaligned memory access
flat view
STALE5163d
From: Szymon Janc <hidden>
Date: 2012-09-04 14:41:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v4 of 3 in this series.
Revisions (3)
- rfc [diff vs current]
- v2 [diff vs current]
- v4 current
This fix following build errors on ARM. CC audio/bluetoothd-avrcp.o audio/avrcp.c: In function avrcp_handle_get_element_attributes: audio/avrcp.c:667:25: error: cast increases required alignment of target type [-Werror=cast-align] audio/avrcp.c:690:20: error: cast increases required alignment of target type [-Werror=cast-align] cc1: all warnings being treated as errors make[1]: *** [audio/bluetoothd-avrcp.o] Error 1 make: *** [all] Error 2 --- audio/avrcp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/audio/avrcp.c b/audio/avrcp.c
index 0688ffa..27be7e8 100644
--- a/audio/avrcp.c
+++ b/audio/avrcp.c@@ -665,13 +665,13 @@ static uint8_t avrcp_handle_get_element_attributes(struct avrcp_player *player, uint8_t transaction) { uint16_t len = ntohs(pdu->params_len); - uint64_t *identifier = (uint64_t *) &pdu->params[0]; + uint64_t identifier = bt_get_le64(&pdu->params[0]); uint16_t pos; uint8_t nattr; GList *attr_ids; uint16_t offset; - if (len < 9 || *identifier != 0) + if (len < 9 || identifier != 0) goto err; nattr = pdu->params[8];
@@ -688,10 +688,10 @@ static uint8_t avrcp_handle_get_element_attributes(struct avrcp_player *player, len = g_list_length(attr_ids); } else { unsigned int i; - uint32_t *attr = (uint32_t *) &pdu->params[9]; + for (i = 0, len = 0, attr_ids = NULL; i < nattr; i++) { + uint32_t id; - for (i = 0, len = 0, attr_ids = NULL; i < nattr; i++, attr++) { - uint32_t id = ntohl(bt_get_unaligned(attr)); + id = bt_get_be32(&pdu->params[9] + (i * sizeof(id))); /* Don't add invalid attributes */ if (id == AVRCP_MEDIA_ATTRIBUTE_ILLEGAL ||
--
1.7.9.5