diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 4fbf67eda239..7705e26e699f 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
| @@ -620,7 +620,8 @@ static void l2cap_conn_start(struct l2cap_conn *conn) | |||
| 620 | struct sock *parent = bt_sk(sk)->parent; | 620 | struct sock *parent = bt_sk(sk)->parent; |
| 621 | rsp.result = cpu_to_le16(L2CAP_CR_PEND); | 621 | rsp.result = cpu_to_le16(L2CAP_CR_PEND); |
| 622 | rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND); | 622 | rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND); |
| 623 | parent->sk_data_ready(parent, 0); | 623 | if (parent) |
| 624 | parent->sk_data_ready(parent, 0); | ||
| 624 | 625 | ||
| 625 | } else { | 626 | } else { |
| 626 | sk->sk_state = BT_CONFIG; | 627 | sk->sk_state = BT_CONFIG; |
| @@ -4009,7 +4010,8 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) | |||
| 4009 | struct sock *parent = bt_sk(sk)->parent; | 4010 | struct sock *parent = bt_sk(sk)->parent; |
| 4010 | res = L2CAP_CR_PEND; | 4011 | res = L2CAP_CR_PEND; |
| 4011 | stat = L2CAP_CS_AUTHOR_PEND; | 4012 | stat = L2CAP_CS_AUTHOR_PEND; |
| 4012 | parent->sk_data_ready(parent, 0); | 4013 | if (parent) |
| 4014 | parent->sk_data_ready(parent, 0); | ||
| 4013 | } else { | 4015 | } else { |
| 4014 | sk->sk_state = BT_CONFIG; | 4016 | sk->sk_state = BT_CONFIG; |
| 4015 | res = L2CAP_CR_SUCCESS; | 4017 | res = L2CAP_CR_SUCCESS; |