Merge commit 'v3.17' into next

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);
 }