hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

caif: Bugfix - missing spin_unlock 

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>
This commit is contained in:
Sjur Braendeland 2010-05-21 02:16:11 +00:00 committed by David S. Miller
parent ca6a09f25c
commit a9a8f1070d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/caif/caif_socket.c
View File

@ -60,7 +60,7 @@ struct debug_fs_counter {
atomic_t num_rx_flow_off; atomic_t num_rx_flow_off;
atomic_t num_rx_flow_on; 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_inc(v) atomic_inc(v)
#define dbfs_atomic_dec(v) atomic_dec(v) #define dbfs_atomic_dec(v) atomic_dec(v)
#else #else
@ -128,13 +128,13 @@ static void caif_read_unlock(struct sock *sk)
mutex_unlock(&cf_sk->readlock); 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 */ /* A quarter of full buffer is used a low water mark */
return cf_sk->sk.sk_rcvbuf / 4; 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; struct caifsock *cf_sk;
cf_sk = container_of(sk, struct caifsock, 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 * Copied from sock.c:sock_queue_rcv_skb(), but changed so packets are
* not dropped, but CAIF is sending flow off instead. * 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 err;
int skb_len; int skb_len;
@ -1184,7 +1184,7 @@ static struct net_proto_family caif_family_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
int af_caif_init(void) static int af_caif_init(void)
{ {
int err = sock_register(&caif_family_ops); int err = sock_register(&caif_family_ops);
if (!err) if (!err)

3
net/caif/cfmuxl.c
View File

@ -174,10 +174,11 @@ struct cflayer *cfmuxl_remove_uplayer(struct cflayer *layr, u8 id)
spin_lock(&muxl->receive_lock); spin_lock(&muxl->receive_lock);
up = get_up(muxl, id); up = get_up(muxl, id);
if (up == NULL) if (up == NULL)
return NULL; goto out;
memset(muxl->up_cache, 0, sizeof(muxl->up_cache)); memset(muxl->up_cache, 0, sizeof(muxl->up_cache));
list_del(&up->node); list_del(&up->node);
cfsrvl_put(up); cfsrvl_put(up);
out:
spin_unlock(&muxl->receive_lock); spin_unlock(&muxl->receive_lock);
return up; return up;
} }