projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
net
/
bluetooth
/
l2cap.c
diff --git
a/net/bluetooth/l2cap.c
b/net/bluetooth/l2cap.c
index
daa7a98
..
cd8f6ea
100644
(file)
--- 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:
break;
case 2:
- *val =
__le16_to_cpu(*((__le16 *) opt->val)
);
+ *val =
get_unaligned_le16(opt->val
);
break;
case 4:
break;
case 4:
- *val =
__le32_to_cpu(*((__le32 *) opt->val)
);
+ *val =
get_unaligned_le32(opt->val
);
break;
default:
break;
default:
@@
-2452,11
+2452,11
@@
static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val)
break;
case 2:
break;
case 2:
-
*((__le16 *) opt->val) = cpu_to_le16(
val);
+
put_unaligned_le16(val, opt->
val);
break;
case 4:
break;
case 4:
-
*((__le32 *) opt->val) = cpu_to_le32(
val);
+
put_unaligned_le32(val, opt->
val);
break;
default:
break;
default: