mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 08:03:01 +09:00
Merge branch 'for-5.14/multitouch' into for-linus
- patch series that ensures that hid-multitouch driver disables touch and button-press reporting on hid-mt devices during suspend when the device is not configured as a wakeup-source, from Hans de Goede
This commit is contained in:
@@ -801,6 +801,7 @@ struct hid_driver {
|
||||
* @raw_request: send raw report request to device (e.g. feature report)
|
||||
* @output_report: send output report to device
|
||||
* @idle: send idle request to device
|
||||
* @may_wakeup: return if device may act as a wakeup source during system-suspend
|
||||
*/
|
||||
struct hid_ll_driver {
|
||||
int (*start)(struct hid_device *hdev);
|
||||
@@ -825,6 +826,7 @@ struct hid_ll_driver {
|
||||
int (*output_report) (struct hid_device *hdev, __u8 *buf, size_t len);
|
||||
|
||||
int (*idle)(struct hid_device *hdev, int report, int idle, int reqtype);
|
||||
bool (*may_wakeup)(struct hid_device *hdev);
|
||||
};
|
||||
|
||||
extern struct hid_ll_driver i2c_hid_ll_driver;
|
||||
@@ -1150,6 +1152,22 @@ static inline int hid_hw_idle(struct hid_device *hdev, int report, int idle,
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* hid_may_wakeup - return if the hid device may act as a wakeup source during system-suspend
|
||||
*
|
||||
* @hdev: hid device
|
||||
*/
|
||||
static inline bool hid_hw_may_wakeup(struct hid_device *hdev)
|
||||
{
|
||||
if (hdev->ll_driver->may_wakeup)
|
||||
return hdev->ll_driver->may_wakeup(hdev);
|
||||
|
||||
if (hdev->dev.parent)
|
||||
return device_may_wakeup(hdev->dev.parent);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* hid_hw_wait - wait for buffered io to complete
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user