summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimangi Saraogi <himangi774@gmail.com>2014-07-15 00:34:13 +0400
committerMarcel Holtmann <marcel@holtmann.org>2014-07-15 01:00:13 +0400
commit4d042654afb342386cb5c33e29843b76d598ab61 (patch)
treede5850e7e9bc9ee1e1e715aeb9124969ea775fdb
parentb2d5e254ebfe9e4a926265c23bc5943f212fd1ac (diff)
downloadlinux-4d042654afb342386cb5c33e29843b76d598ab61.tar.xz
Bluetooth: cmtp: Remove unnecessary null test
This patch removes the null test on ctrl. ctrl is initialized at the beginning of the function to &session->ctrl. Since session is dereferenced prior to the null test, session must be a valid pointer, and &session->ctrl cannot be null. The following Coccinelle script is used for detecting the change: @r@ expression e,f; identifier g,y; statement S1,S2; @@ *e = &f->g <+... f->y ...+> *if (e != NULL || ...) S1 else S2 Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/bluetooth/cmtp/capi.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c
index cd75e4d64b90..1ca8a87a0787 100644
--- a/net/bluetooth/cmtp/capi.c
+++ b/net/bluetooth/cmtp/capi.c
@@ -362,12 +362,6 @@ void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb)
CAPIMSG_SETCONTROL(skb->data, contr);
}
- if (!ctrl) {
- BT_ERR("Can't find controller %d for message", session->num);
- kfree_skb(skb);
- return;
- }
-
capi_ctr_handle_message(ctrl, appl, skb);
}