Selaa lähdekoodia

bluetooth: put hci dev after del conn

Move hci_dev_put to del_conn to avoid hci dev going away before hci conn.

Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Dave Young 17 vuotta sitten
vanhempi
commit
0cd63c8089
2 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 0 1
      net/bluetooth/hci_conn.c
  2. 3 0
      net/bluetooth/hci_sysfs.c

+ 0 - 1
net/bluetooth/hci_conn.c

@@ -260,7 +260,6 @@ int hci_conn_del(struct hci_conn *conn)
 	tasklet_enable(&hdev->tx_task);
 	tasklet_enable(&hdev->tx_task);
 	skb_queue_purge(&conn->data_q);
 	skb_queue_purge(&conn->data_q);
 	hci_conn_del_sysfs(conn);
 	hci_conn_del_sysfs(conn);
-	hci_dev_put(hdev);
 
 
 	return 0;
 	return 0;
 }
 }

+ 3 - 0
net/bluetooth/hci_sysfs.c

@@ -334,6 +334,7 @@ static int __match_tty(struct device *dev, void *data)
 static void del_conn(struct work_struct *work)
 static void del_conn(struct work_struct *work)
 {
 {
 	struct hci_conn *conn = container_of(work, struct hci_conn, work);
 	struct hci_conn *conn = container_of(work, struct hci_conn, work);
+	struct hci_dev *hdev = conn->hdev;
 
 
 	while (1) {
 	while (1) {
 		struct device *dev;
 		struct device *dev;
@@ -344,8 +345,10 @@ static void del_conn(struct work_struct *work)
 		device_move(dev, NULL);
 		device_move(dev, NULL);
 		put_device(dev);
 		put_device(dev);
 	}
 	}
+
 	device_del(&conn->dev);
 	device_del(&conn->dev);
 	put_device(&conn->dev);
 	put_device(&conn->dev);
+	hci_dev_put(hdev);
 }
 }
 
 
 void hci_conn_del_sysfs(struct hci_conn *conn)
 void hci_conn_del_sysfs(struct hci_conn *conn)