From 7dd71989c60aeb8588f45dd92accc375cd3e5834 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Mon, 18 Oct 2010 14:25:53 -0200
Subject: [PATCH] --- yaml --- r: 222027 b: refs/heads/master c:
 4f8b691c9fb02e72359e71592098c1de3b8ec712 h: refs/heads/master i:   222025:
 d5a916ea04bc82f43259b4179289cc88131cbcc2   222023:
 129db9183f7ec6a533f6a27c8559a0082b4c0920 v: v3

---
 [refs]                      | 2 +-
 trunk/net/bluetooth/l2cap.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fd06b706485b..09b30ef843ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfaaeb3ed5533a2dd38e3aa9ea43efd619690aed
+refs/heads/master: 4f8b691c9fb02e72359e71592098c1de3b8ec712
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index b3fb02ab2292..cd8f6ea03841 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -2452,11 +2452,11 @@ static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val)
 		break;
 
 	case 2:
-		put_unaligned_le16(cpu_to_le16(val), opt->val);
+		put_unaligned_le16(val, opt->val);
 		break;
 
 	case 4:
-		put_unaligned_le32(cpu_to_le32(val), opt->val);
+		put_unaligned_le32(val, opt->val);
 		break;
 
 	default: