Skip to content

Commit

Permalink
caif: Bugfix - missing spin_unlock
Browse files Browse the repository at this point in the history
Splint found missing spin_unlock.
Corrected this an some other trivial split warnings.

Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sjur Braendeland authored and David S. Miller committed May 24, 2010
1 parent ca6a09f commit a9a8f10
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions net/caif/caif_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct debug_fs_counter {
atomic_t num_rx_flow_off;
atomic_t num_rx_flow_on;
};
struct debug_fs_counter cnt;
static struct debug_fs_counter cnt;
#define dbfs_atomic_inc(v) atomic_inc(v)
#define dbfs_atomic_dec(v) atomic_dec(v)
#else
Expand Down Expand Up @@ -128,13 +128,13 @@ static void caif_read_unlock(struct sock *sk)
mutex_unlock(&cf_sk->readlock);
}

int sk_rcvbuf_lowwater(struct caifsock *cf_sk)
static int sk_rcvbuf_lowwater(struct caifsock *cf_sk)
{
/* A quarter of full buffer is used a low water mark */
return cf_sk->sk.sk_rcvbuf / 4;
}

void caif_flow_ctrl(struct sock *sk, int mode)
static void caif_flow_ctrl(struct sock *sk, int mode)
{
struct caifsock *cf_sk;
cf_sk = container_of(sk, struct caifsock, sk);
Expand All @@ -146,7 +146,7 @@ void caif_flow_ctrl(struct sock *sk, int mode)
* Copied from sock.c:sock_queue_rcv_skb(), but changed so packets are
* not dropped, but CAIF is sending flow off instead.
*/
int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
{
int err;
int skb_len;
Expand Down Expand Up @@ -1184,7 +1184,7 @@ static struct net_proto_family caif_family_ops = {
.owner = THIS_MODULE,
};

int af_caif_init(void)
static int af_caif_init(void)
{
int err = sock_register(&caif_family_ops);
if (!err)
Expand Down
3 changes: 2 additions & 1 deletion net/caif/cfmuxl.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,11 @@ struct cflayer *cfmuxl_remove_uplayer(struct cflayer *layr, u8 id)
spin_lock(&muxl->receive_lock);
up = get_up(muxl, id);
if (up == NULL)
return NULL;
goto out;
memset(muxl->up_cache, 0, sizeof(muxl->up_cache));
list_del(&up->node);
cfsrvl_put(up);
out:
spin_unlock(&muxl->receive_lock);
return up;
}
Expand Down

0 comments on commit a9a8f10

Please sign in to comment.