Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / hid / intel-ish-hid / ishtp / hbm.c

diff --git a/drivers/hid/intel-ish-hid/ishtp/hbm.c b/drivers/hid/intel-ish-hid/ishtp/hbm.c
index 30a91d068306a0007cfd935fa6e58dec2a6a9492..9c031a06e4c40100b26b512e6ecd5be8c6b5ee28 100644 (file)
--- a/drivers/hid/intel-ish-hid/ishtp/hbm.c
+++ b/drivers/hid/intel-ish-hid/ishtp/hbm.c
@@ -398,7 +398,7 @@ static void ishtp_hbm_cl_connect_res(struct ishtp_device *dev,
 }
 
 /**
- * ishtp_client_disconnect_request() - Receive disconnect request
+ * ishtp_hbm_fw_disconnect_req() - Receive disconnect request
  * @dev: ISHTP device instance
  * @disconnect_req: disconnect request structure
  *
@@ -430,7 +430,7 @@ static void ishtp_hbm_fw_disconnect_req(struct ishtp_device *dev,
 }
 
 /**
- * ishtp_hbm_dma_xfer_ack(() - Receive transfer ACK
+ * ishtp_hbm_dma_xfer_ack() - Receive transfer ACK
  * @dev: ISHTP device instance
  * @dma_xfer: HBM transfer message
  *
@@ -914,7 +914,7 @@ static inline void fix_cl_hdr(struct ishtp_msg_hdr *hdr, size_t length,
 /*** Suspend and resume notification ***/
 
 static uint32_t current_state;
-static uint32_t supported_states = 0 | SUSPEND_STATE_BIT;
+static uint32_t supported_states = SUSPEND_STATE_BIT | CONNECTED_STANDBY_STATE_BIT;
 
 /**
  * ishtp_send_suspend() - Send suspend message to FW
@@ -933,7 +933,7 @@ void ishtp_send_suspend(struct ishtp_device *dev)
        memset(&state_status_msg, 0, len);
        state_status_msg.hdr.cmd = SYSTEM_STATE_STATUS;
        state_status_msg.supported_states = supported_states;
-       current_state |= SUSPEND_STATE_BIT;
+       current_state |= (SUSPEND_STATE_BIT | CONNECTED_STANDBY_STATE_BIT);
        dev->print_log(dev, "%s() sends SUSPEND notification\n", __func__);
        state_status_msg.states_status = current_state;
 
@@ -959,7 +959,7 @@ void ishtp_send_resume(struct ishtp_device *dev)
        memset(&state_status_msg, 0, len);
        state_status_msg.hdr.cmd = SYSTEM_STATE_STATUS;
        state_status_msg.supported_states = supported_states;
-       current_state &= ~SUSPEND_STATE_BIT;
+       current_state &= ~(CONNECTED_STANDBY_STATE_BIT | SUSPEND_STATE_BIT);
        dev->print_log(dev, "%s() sends RESUME notification\n", __func__);
        state_status_msg.states_status = current_state;