diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
commit | a3ea8e8f2474c35b4c3e22262991afddb93c4c0e (patch) | |
tree | 648bbeea304950d02e71863673be8154a5e491f6 /net/caif/caif_socket.c | |
parent | c2de187e5b0f25b572ac1cb6cdf383f16123717d (diff) | |
parent | ebb47241ea0eac6a5a23404821a2d62f64c68496 (diff) | |
download | blackbird-op-linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.gz blackbird-op-linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.zip |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'net/caif/caif_socket.c')
-rw-r--r-- | net/caif/caif_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 8184c031d028..37a4034dfc29 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -852,7 +852,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr, sock->state = SS_CONNECTING; sk->sk_state = CAIF_CONNECTING; - /* Check priority value comming from socket */ + /* Check priority value coming from socket */ /* if priority value is out of range it will be ajusted */ if (cf_sk->sk.sk_priority > CAIF_PRIO_MAX) cf_sk->conn_req.priority = CAIF_PRIO_MAX; |