From d0d3370b0d963d86339e86ccb8e6deaab2fd2b76 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 18 Feb 2008 00:20:50 -0800 Subject: [PATCH] --- yaml --- r: 85843 b: refs/heads/master c: 988d0093f9cb2bf27c299e373f9cbaac47dab2c1 h: refs/heads/master i: 85841: 41e0f306c5e1e4709c3065df90112eedf59a1257 85839: 21f8bb5398591bebbfa9131db856aa24bf5c39ba v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_sysfs.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c8f3e69f3422..b7a9905fe56c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fea5fa875eb235dc186b1f5184eb36abc63e26cc +refs/heads/master: 988d0093f9cb2bf27c299e373f9cbaac47dab2c1 diff --git a/trunk/net/bluetooth/hci_sysfs.c b/trunk/net/bluetooth/hci_sysfs.c index e13cf5ef144c..f5aff6d0988a 100644 --- a/trunk/net/bluetooth/hci_sysfs.c +++ b/trunk/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); }