Commit 412fe29f authored by Hans de Goede's avatar Hans de Goede Committed by Marcel Holtmann
Browse files

Bluetooth: hci_uart: Restore hci_dev->flush callback on open() 



For reasons explained in detail in commit 3611f4d2 ("hci_ldisc:
fix null pointer deref") the hci_uart_close() functions sets
hci_dev->flush to NULL.

But the device may be re-opened after a close, this commit restores the
hci_dev->flush callback on open().

Note this commit also moves the nearly empty defition of hci_uart_open()
a bit down in the file to avoid the need for forward declaring
hci_uart_flush().

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent c2e7f5de

drivers/bluetooth/hci_ldisc.c

+11 −9
Original line number Diff line number Diff line
@@ -229,15 +229,6 @@ int hci_uart_init_ready(struct hci_uart *hu) 
}



/* ------- Interface to HCI layer ------ */

/* Initialize device */

static int hci_uart_open(struct hci_dev *hdev)

{

	BT_DBG("%s %p", hdev->name, hdev);



	/* Nothing to do for UART driver */

	return 0;

}



/* Reset device */

static int hci_uart_flush(struct hci_dev *hdev)

{
@@ -264,6 +255,17 @@ static int hci_uart_flush(struct hci_dev *hdev) 
	return 0;

}



/* Initialize device */

static int hci_uart_open(struct hci_dev *hdev)

{

	BT_DBG("%s %p", hdev->name, hdev);



	/* Undo clearing this from hci_uart_close() */

	hdev->flush = hci_uart_flush;



	return 0;

}



/* Close device */

static int hci_uart_close(struct hci_dev *hdev)

{

drivers/bluetooth/hci_serdev.c

+11 −8
Original line number Diff line number Diff line
@@ -101,14 +101,6 @@ static void hci_uart_write_work(struct work_struct *work) 


/* ------- Interface to HCI layer ------ */



/* Initialize device */

static int hci_uart_open(struct hci_dev *hdev)

{

	BT_DBG("%s %p", hdev->name, hdev);



	return 0;

}



/* Reset device */

static int hci_uart_flush(struct hci_dev *hdev)

{
@@ -129,6 +121,17 @@ static int hci_uart_flush(struct hci_dev *hdev) 
	return 0;

}



/* Initialize device */

static int hci_uart_open(struct hci_dev *hdev)

{

	BT_DBG("%s %p", hdev->name, hdev);



	/* Undo clearing this from hci_uart_close() */

	hdev->flush = hci_uart_flush;



	return 0;

}



/* Close device */

static int hci_uart_close(struct hci_dev *hdev)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE