Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ac62dc7 authored by Dave Young's avatar Dave Young Committed by David S. Miller
Browse files

bluetooth: do not move child device other than rfcomm 



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: default avatarDave Young <hidave.darkstar@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0cd63c80

net/bluetooth/hci_sysfs.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -320,15 +320,14 @@ void hci_conn_add_sysfs(struct hci_conn *conn) 
	queue_work(btaddconn, &conn->work);

	queue_work(btaddconn, &conn->work);

}

}





static int __match_tty(struct device *dev, void *data)

/*

{

 * The rfcomm tty device will possibly retain even when conn

	/* The rfcomm tty device will possibly retain even when conn

 * is down, and sysfs doesn't support move zombie device,

 * is down, and sysfs doesn't support move zombie device,

 * so we should move the device before conn device is destroyed.

 * 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;

static int __match_tty(struct device *dev, void *data)

{

	return !strncmp(dev->bus_id, "rfcomm", 6);

}

}





static void del_conn(struct work_struct *work)

static void del_conn(struct work_struct *work)