Merge tag 'soundwire-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-2.6-microblaze.git] / drivers / bluetooth / hci_qca.c

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index bbe9cf1..3df8c36 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -128,13 +128,13 @@ struct qca_memdump_event_hdr {
        __u8    evt;
        __u8    plen;
        __u16   opcode;
-       __u16   seq_no;
+       __le16   seq_no;
        __u8    reserved;
 } __packed;
 
 
 struct qca_dump_size {
-       u32 dump_size;
+       __le32 dump_size;
 } __packed;
 
 struct qca_data {
@@ -1588,10 +1588,11 @@ static bool qca_wakeup(struct hci_dev *hdev)
        struct hci_uart *hu = hci_get_drvdata(hdev);
        bool wakeup;
 
-       /* UART driver handles the interrupt from BT SoC.So we need to use
-        * device handle of UART driver to get the status of device may wakeup.
+       /* BT SoC attached through the serial bus is handled by the serdev driver.
+        * So we need to use the device handle of the serdev driver to get the
+        * status of device may wakeup.
         */
-       wakeup = device_may_wakeup(hu->serdev->ctrl->dev.parent);
+       wakeup = device_may_wakeup(&hu->serdev->ctrl->dev);
        bt_dev_dbg(hu->hdev, "wakeup status : %d", wakeup);
 
        return wakeup;