Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a8f107 authored by Sjur Braendeland's avatar Sjur Braendeland Committed by David S. Miller
Browse files

caif: Bugfix - missing spin_unlock 



Splint found missing spin_unlock.
Corrected this an some other trivial split warnings.

Signed-off-by: default avatarSjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca6a09f2

net/caif/caif_socket.c

+5 −5
Original line number Diff line number Diff line
@@ -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
@@ -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);
@@ -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;
@@ -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)

net/caif/cfmuxl.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}