From b6c78194a7ada2b2724bfd7c702858f539736ca7 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Tue, 20 Mar 2012 10:32:25 +0200 Subject: [PATCH] --- yaml --- r: 306852 b: refs/heads/master c: 3e9fb6d87ee543b10bcf245d4a5c6aa1ab0ac2ab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/mgmt.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2139257f17d3..8a3ca48d5035 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c72d4b8afa8002cd6f64225954bee78296321e7e +refs/heads/master: 3e9fb6d87ee543b10bcf245d4a5c6aa1ab0ac2ab diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c index f590dfbe9e07..1d3e3d00d25f 100644 --- a/trunk/net/bluetooth/mgmt.c +++ b/trunk/net/bluetooth/mgmt.c @@ -443,9 +443,7 @@ static u16 get_uuid16(u8 *uuid128) return 0; } - memcpy(&val, &uuid128[12], 4); - - val = le32_to_cpu(val); + val = get_unaligned_le32(&uuid128[12]); if (val > 0xffff) return 0;