---

yaml --- r: 306891 b: refs/heads/master c: 7d5d775 h: refs/heads/master i: 306889: fca4fa4 306887: c6cec59 v: v3
git-mirror · May 9, 2012 · 03b7373 · 03b7373
1 parent 5dbe1b9
commit 03b7373
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b3af7334bd3c403647606adfb04f6e6bcf1597e
+refs/heads/master: 7d5d775a55554183448b591a86b1d172ae993b94
diff --git a/trunk/net/bluetooth/sco.c b/trunk/net/bluetooth/sco.c
@@ -539,11 +539,16 @@ static int sco_sock_listen(struct socket *sock, int backlog)
 
 	lock_sock(sk);
 
-	if (sk->sk_state != BT_BOUND || sock->type != SOCK_SEQPACKET) {
+	if (sk->sk_state != BT_BOUND) {
 		err = -EBADFD;
 		goto done;
 	}
 
+	if (sk->sk_type != SOCK_SEQPACKET) {
+		err = -EINVAL;
+		goto done;
+	}
+
 	sk->sk_max_ack_backlog = backlog;
 	sk->sk_ack_backlog = 0;
 	sk->sk_state = BT_LISTEN;