2017-07-08 13:43:33

by Ian Molton

Subject: PATCH: Nokia bluetooth patches

Hi Marcel,

Please apply these two small fixes for hci_nokia.c

Cheers!

-Ian

2017-07-08 14:14:35

by Marcel Holtmann

Subject: Re: PATCH: Nokia bluetooth patches

Hi Ian,

> Please apply these two small fixes for hci_nokia.c

both patches have been applied to bluetooth-next tree.

Regards

Marcel

2017-07-08 13:43:35

by Ian Molton

Subject: [PATCH 2/2] bluetooth: Nokia: remove duplicate call to pm_runtime_disable()

pm_runtime_disable() is called in the _close() handler.

Since we call the _close() handler on remove, there is no need to
call pm_runtime_disable() a second time.

Signed-off-by: Ian Molton <[email protected]>
Reviewed-by: Sebastian Reichel <[email protected]>
---
drivers/bluetooth/hci_nokia.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/bluetooth/hci_nokia.c b/drivers/bluetooth/hci_nokia.c
index bc1f4496583e..6dbb1f6ff6bd 100644
--- a/drivers/bluetooth/hci_nokia.c
+++ b/drivers/bluetooth/hci_nokia.c
@@ -777,8 +777,6 @@ static void nokia_bluetooth_serdev_remove(struct serdev_device *serdev)
cancel_work_sync(&hu->write_work);

hu->proto->close(hu);
-
- pm_runtime_disable(&btdev->serdev->dev);
}

static int nokia_bluetooth_runtime_suspend(struct device *dev)
--
2.11.0

2017-07-08 13:43:34

by Ian Molton

Subject: [PATCH 1/2] bluetooth: Nokia: prevent crash on module removal.

Only cancel any ongoing work after making sure, that no new work
can be scheduled. This fixes a race condition in the remove handler.

Signed-off-by: Ian Molton <[email protected]>
Reviewed-by: Sebastian Reichel <[email protected]>
---
drivers/bluetooth/hci_nokia.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/bluetooth/hci_nokia.c b/drivers/bluetooth/hci_nokia.c
index 181a15b549e5..bc1f4496583e 100644
--- a/drivers/bluetooth/hci_nokia.c
+++ b/drivers/bluetooth/hci_nokia.c
@@ -770,10 +770,12 @@ static void nokia_bluetooth_serdev_remove(struct serdev_device *serdev)
struct hci_uart *hu = &btdev->hu;
struct hci_dev *hdev = hu->hdev;

- cancel_work_sync(&hu->write_work);

hci_unregister_dev(hdev);
hci_free_dev(hdev);
+
+ cancel_work_sync(&hu->write_work);
+
hu->proto->close(hu);

pm_runtime_disable(&btdev->serdev->dev);
--
2.11.0