diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-10 22:15:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-10 22:15:31 -0800 |
| commit | 8877870f8a8127b653f8c9a55c6b4de9f96f639b (patch) | |
| tree | cc2629911f6b011ee2e3f4a85febbb9b6cc63604 /net/bluetooth/l2cap.c | |
| parent | 7a1abd08d52fdeddb3e9a5a33f2f15cc6a5674d2 (diff) | |
| parent | 7379efeacb707f49729080791a7a562d8996aec4 (diff) | |
| download | linux-8877870f8a8127b653f8c9a55c6b4de9f96f639b.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/bluetooth/l2cap.c')
| -rw-r--r-- | net/bluetooth/l2cap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index daa7a988d9a6..cd8f6ea03841 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -2421,11 +2421,11 @@ static inline int l2cap_get_conf_opt(void **ptr, int *type, int *olen, unsigned break; case 2: - *val = __le16_to_cpu(*((__le16 *) opt->val)); + *val = get_unaligned_le16(opt->val); break; case 4: - *val = __le32_to_cpu(*((__le32 *) opt->val)); + *val = get_unaligned_le32(opt->val); break; default: @@ -2452,11 +2452,11 @@ static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val) break; case 2: - *((__le16 *) opt->val) = cpu_to_le16(val); + put_unaligned_le16(val, opt->val); break; case 4: - *((__le32 *) opt->val) = cpu_to_le32(val); + put_unaligned_le32(val, opt->val); break; default: |