From 992f996fd9a5396406fd5c0f628e122e2bea38da Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 22 May 2010 10:43:42 +0000 Subject: [PATCH] --- yaml --- r: 202585 b: refs/heads/master c: f5d72af9f3dfea67f014f880d00665f96622f57f h: refs/heads/master i: 202583: a51c6a6b42cd99eb2087f38ef123ba8a5691f0c8 v: v3 --- [refs] | 2 +- trunk/net/caif/caif_socket.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d52ca31fe338..1cf0881b9dec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 024cb8a67f3d3438322fac9d6f7b1cc578eca71c +refs/heads/master: f5d72af9f3dfea67f014f880d00665f96622f57f diff --git a/trunk/net/caif/caif_socket.c b/trunk/net/caif/caif_socket.c index 3d0e09584fae..791249316ef3 100644 --- a/trunk/net/caif/caif_socket.c +++ b/trunk/net/caif/caif_socket.c @@ -874,8 +874,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr, sk_stream_kill_queues(&cf_sk->sk); err = -EINVAL; - if (addr_len != sizeof(struct sockaddr_caif) || - !uaddr) + if (addr_len != sizeof(struct sockaddr_caif)) goto out; memcpy(&cf_sk->conn_req.sockaddr, uaddr,