bluetooth: hci_qca: Fix suspend/resume functionality failure
PATCH v2 1/1 bluetooth: hci_qca: Fix suspend/resume functionality failure
@dev parameter of qca_suspend()/qca_resume() represents serdev_device, but it is mistook for hci_dev and causes succedent unexpected memory access.
Fix by taking @dev as serdev_device.
---
Changes in v2:
- remove unused variable @hdev
drivers/bluetooth/hci_qca.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/bluetooth/hci_qca.c +6 -4
@@ -1977,8 +1977,9 @@ static void qca_serdev_remove(struct serdev_device *serdev)static int __maybe_unused qca_suspend (struct device *dev) { - struct hci_dev *hdev = container_of(dev, struct hci_dev, dev); -struct hci_uart *hu =hci_get_drvdata (hdev); +struct serdev_device *serdev =to_serdev_device (dev); +struct qca_serdev *qcadev =serdev_device_get_drvdata (serdev); +struct hci_uart *hu = &qcadev->serdev_hu;struct qca_data *qca = hu->priv;unsigned long flags;int ret =0 ;
@@ -2057,8 +2058,9 @@ static int __maybe_unused qca_suspend(struct device *dev)static int __maybe_unused qca_resume (struct device *dev) { - struct hci_dev *hdev = container_of(dev, struct hci_dev, dev); -struct hci_uart *hu =hci_get_drvdata (hdev); +struct serdev_device *serdev =to_serdev_device (dev); +struct qca_serdev *qcadev =serdev_device_get_drvdata (serdev); +struct hci_uart *hu = &qcadev->serdev_hu;struct qca_data *qca = hu->priv;clear_bit (QCA_SUSPENDING , &qca->flags);
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 8 lines · Zijun Hu
@dev parameter of qca_suspend()/qca_resume() represents
serdev_device, but it is mistook forhci_devand causes succedent unexpected memory access.Fix by taking @dev as
serdev_device.Fixes 41d5b25fed0 ("Bluetooth: hci_qca: add PM support")Signed-off-by Zijun Hu <[email protected]>
Marcel Holtmann
maintainerHi Zijun,
Quoted 6 lines
@dev parameter of qca_suspend()/qca_resume() represents
serdev_device, but it is mistook forhci_devand causes succedent unexpected memory access.Fix by taking @dev as
serdev_device.
Quoted 8 lines
Fixes 41d5b25fed0 ("Bluetooth: hci_qca: add PM support")Signed-off-by Zijun Hu <[email protected]>---
Changes in v2:
- remove unused variable @hdev
drivers/bluetooth/hci_qca.c| 10 ++++++----1 file changed, 6 insertions(+), 4 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel