From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:16:50 +0000 (+0800)
Subject: Revert "Bluetooth: Hack: Don't dereference null pointer."
X-Git-Tag: firefly_0821_release~10008
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ec62f37b701d8380f98f1babaab5c190d8dbaa5b;p=firefly-linux-kernel-4.4.55.git

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 424712ca28ba..4529e99b2940 100644
--- 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;