1 files changed, 6 insertions, 2 deletions

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index e13cf5ef144c..f5aff6d0988a 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -333,10 +333,14 @@ static int __match_tty(struct device *dev, void *data)
 
 static void del_conn(struct work_struct *work)
 {
-        struct device *dev;
         struct hci_conn *conn = container_of(work, struct hci_conn, work);
 
-        while (dev = device_find_child(&conn->dev, NULL, __match_tty)) {
+        while (1) {
+                struct device *dev;
+
+                dev = device_find_child(&conn->dev, NULL, __match_tty);
+                if (!dev)
+                        break;
                 device_move(dev, NULL);
                 put_device(dev);
         }