From ae281972932a37fa6715079b426dbf9f7e45aa72 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 21 Apr 2010 23:52:01 +0000
Subject: [PATCH] --- yaml --- r: 190365 b: refs/heads/master c:
 477fffb082920476cc26f238d65538ccb8d601e1 h: refs/heads/master i:   190363:
 6980bde01a9db9afa4b56728617b15d259ebee46 v: v3

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

diff --git a/[refs] b/[refs]
index 4c233cf0c6f6..7d0da183f8c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 761ed01b35ca32bfd4166cc3862ae80ee33e3a4b
+refs/heads/master: 477fffb082920476cc26f238d65538ccb8d601e1
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 99d68c34e4f1..9753b690a8b3 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -1626,7 +1626,10 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
 	/* Connectionless channel */
 	if (sk->sk_type == SOCK_DGRAM) {
 		skb = l2cap_create_connless_pdu(sk, msg, len);
-		err = l2cap_do_send(sk, skb);
+		if (IS_ERR(skb))
+			err = PTR_ERR(skb);
+		else
+			err = l2cap_do_send(sk, skb);
 		goto done;
 	}