lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 074/376] Bluetooth: hci_qca: Fix suspend/resume functionality failure
    Date
    From: Zijun Hu <zijuhu@codeaurora.org>

    [ Upstream commit feac90d756c03b03b83fabe83571bd88ecc96b78 ]

    @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.

    Fixes: 41d5b25fed0 ("Bluetooth: hci_qca: add PM support")
    Signed-off-by: Zijun Hu <zijuhu@codeaurora.org>
    Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/bluetooth/hci_qca.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
    index 439392b1c043..0b1036e5e963 100644
    --- a/drivers/bluetooth/hci_qca.c
    +++ b/drivers/bluetooth/hci_qca.c
    @@ -1953,8 +1953,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;
    @@ -2033,8 +2034,9 @@ error:

    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);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 17:23    [W:4.080 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site