Skip to content

Commit

Permalink
bluetooth: do not move child device other than rfcomm
Browse files Browse the repository at this point in the history
hci conn child devices other than rfcomm tty should not be moved here.
This is my lost, thanks for Barnaby's reporting and testing.

Signed-off-by: Dave Young <hidave.darkstar@gmail.com> 
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dave Young authored and David S. Miller committed Feb 19, 2008
1 parent 0cd63c8 commit 8ac62dc
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions net/bluetooth/hci_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,15 +320,14 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
queue_work(btaddconn, &conn->work);
}

/*
* The rfcomm tty device will possibly retain even when conn
* is down, and sysfs doesn't support move zombie device,
* so we should move the device before conn device is destroyed.
*/
static int __match_tty(struct device *dev, void *data)
{
/* The rfcomm tty device will possibly retain even when conn
* is down, and sysfs doesn't support move zombie device,
* so we should move the device before conn device is destroyed.
* Due to the only child device of hci_conn dev is rfcomm
* tty_dev, here just return 1
*/
return 1;
return !strncmp(dev->bus_id, "rfcomm", 6);
}

static void del_conn(struct work_struct *work)
Expand Down

0 comments on commit 8ac62dc

Please sign in to comment.