Revert "Bluetooth: Hack: Don't dereference null pointer."

This reverts commit 612cd5aa166a6f22660ebd104a08a40576c44a36.

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 424712ca28ba1623a79becab0904dc538df93b2a..4529e99b2940dfa2b12997e9a19a6d1f23bc58eb 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -464,8 +464,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
                                        struct sock *parent = bt_sk(sk)->parent;
                                        rsp.result = cpu_to_le16(L2CAP_CR_PEND);
                                        rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
-                                       if (parent)
-                                               parent->sk_data_ready(parent, 0);
+                                       parent->sk_data_ready(parent, 0);
 
                                } else {
                                        sk->sk_state = BT_CONFIG;