3 files changed, 3 insertions, 9 deletions

diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 2312d050eeed..4d3424c2421c 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -528,12 +528,10 @@ static struct device *bnep_get_device(struct bnep_session *session)
                 return NULL;
 
         conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, dst);
-        if (!conn)
-                return NULL;
 
         hci_dev_put(hdev);
 
-        return &conn->dev;
+        return conn ? &conn->dev : NULL;
 }
 
 int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index b2d6da67d885..9a562cf7406b 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -541,12 +541,10 @@ static struct device *hidp_get_device(struct hidp_session *session)
                 return NULL;
 
         conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, dst);
-        if (!conn)
-                return NULL;
 
         hci_dev_put(hdev);
 
-        return &conn->dev;
+        return conn ? &conn->dev : NULL;
 }
 
 static inline void hidp_setup_input(struct hidp_session *session, struct hidp_connadd_req *req)
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 1958ad1b8541..5833b87c51cf 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -172,12 +172,10 @@ static struct device *rfcomm_get_device(struct rfcomm_dev *dev)
                 return NULL;
 
         conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &dev->dst);
-        if (!conn)
-                return NULL;
 
         hci_dev_put(hdev);
 
-        return &conn->dev;
+        return conn ? &conn->dev : NULL;
 }
 
 static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)