Lines Matching +full:rfkill +full:- +full:gpio

1 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
3 --- a/net/bluetooth/l2cap_sock.c
5 @@ -1527,9 +1527,6 @@ static void l2cap_sock_close_cb(struct l2cap_chan *chan)
7  	struct sock *sk = chan->data;
9 -	if (!sk)
10 -		return;
11 -
15 @@ -1538,9 +1535,6 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err)
16  	struct sock *sk = chan->data;
19 -	if (!sk)
20 -		return;
21 -
22  	BT_DBG("chan %p state %s", chan, state_to_string(chan->state));
25 @@ -1732,10 +1726,8 @@ static void l2cap_sock_destruct(struct sock *sk)
29 -	if (l2cap_pi(sk)->chan) {
30 -		l2cap_pi(sk)->chan->data = NULL;
31 +	if (l2cap_pi(sk)->chan)
32  		l2cap_chan_put(l2cap_pi(sk)->chan);
33 -	}
35  	if (l2cap_pi(sk)->rx_busy_skb) {
36  		kfree_skb(l2cap_pi(sk)->rx_busy_skb);
37 diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
39 --- a/net/bluetooth/sco.c
41 @@ -93,10 +93,10 @@ static void sco_sock_timeout(struct work_struct *work)
43  	BT_DBG("sock %p state %d", sk, sk->sk_state);
45 -	lock_sock(sk);
47  	sk->sk_err = ETIMEDOUT;
48  	sk->sk_state_change(sk);
49 -	release_sock(sk);
54 @@ -193,10 +193,10 @@ static void sco_conn_del(struct hci_conn *hcon, int err)
58 -		lock_sock(sk);
62 -		release_sock(sk);
67 @@ -1103,10 +1103,10 @@ static void sco_conn_ready(struct sco_conn *conn)
71 -		lock_sock(sk);
73  		sk->sk_state = BT_CONNECTED;
74  		sk->sk_state_change(sk);
75 -		release_sock(sk);
80 @@ -1121,12 +1121,12 @@ static void sco_conn_ready(struct sco_conn *conn)
84 -		lock_sock(parent);
90 -			release_sock(parent);
95 @@ -1147,7 +1147,7 @@ static void sco_conn_ready(struct sco_conn *conn)
97  		parent->sk_data_ready(parent);
99 -		release_sock(parent);
104 diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
106 --- a/net/rfkill/Kconfig
107 +++ b/net/rfkill/Kconfig
108 @@ -32,3 +32,12 @@ config RFKILL_GPIO
110  	  If you say yes here you get support of a generic gpio RFKILL
114 +	tristate "Rockchip RFKILL driver"
115 +	depends on RFKILL
120 +	  Rockchip rfkill driver for rk29/rk3X
121 diff --git a/net/rfkill/Makefile b/net/rfkill/Makefile
123 --- a/net/rfkill/Makefile
124 +++ b/net/rfkill/Makefile
125 @@ -7,3 +7,5 @@ rfkill-y			+= core.o
126  rfkill-$(CONFIG_RFKILL_INPUT)	+= input.o
127  obj-$(CONFIG_RFKILL)		+= rfkill.o
128  obj-$(CONFIG_RFKILL_GPIO)	+= rfkill-gpio.o
129 +rfkill-rk-y			+= rfkill-wlan.o rfkill-bt.o
130 +obj-$(CONFIG_RFKILL_RK)		+= rfkill-rk.o