Bluetooth: hci_serdev: do not open device in hci open

The device driver may need to communicate with the UART
device while the Bluetooth device is closed (e.g. due
to interrupts).

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c
index f5ccb2c7ef921ad0f3647f58ef42e84da2b5c7a6..3b8ac0ece3fbf6a3dc9c3091e5f44afe9b8eff00 100644 (file)
--- a/drivers/bluetooth/hci_serdev.c
+++ b/drivers/bluetooth/hci_serdev.c
@@ -104,13 +104,9 @@ static void hci_uart_write_work(struct work_struct *work)
 /* Initialize device */
 static int hci_uart_open(struct hci_dev *hdev)
 {
-       struct hci_uart *hu  = hci_get_drvdata(hdev);
-
        BT_DBG("%s %p", hdev->name, hdev);
 
-       serdev_device_set_client_ops(hu->serdev, &hci_serdev_client_ops);
-
-       return serdev_device_open(hu->serdev);
+       return 0;
 }
 
 /* Reset device */
@@ -136,15 +132,11 @@ static int hci_uart_flush(struct hci_dev *hdev)
 /* Close device */
 static int hci_uart_close(struct hci_dev *hdev)
 {
-       struct hci_uart *hu  = hci_get_drvdata(hdev);
-
        BT_DBG("hdev %p", hdev);
 
        hci_uart_flush(hdev);
        hdev->flush = NULL;
 
-       serdev_device_close(hu->serdev);
-
        return 0;
 }
 
@@ -289,6 +281,8 @@ int hci_uart_register_device(struct hci_uart *hu,
 
        BT_DBG("");
 
+       serdev_device_set_client_ops(hu->serdev, &hci_serdev_client_ops);
+
        err = p->open(hu);
        if (err)
                return err;