diff options
| author | Jiri Kosina | 2019-09-22 22:33:41 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2019-09-22 22:33:41 +0200 |
| commit | 979d859d3ff130ff212472d7fc67a474cdd96047 (patch) | |
| tree | f06c74385abfeeadd8a8f43ba318062f92cf41aa /drivers/hid/intel-ish-hid/ipc/hw-ish.h | |
| parent | 98656d503dd62258bfa8aaf2cd702ad3491e0713 (diff) | |
| parent | fc19a57dd4834a939b5eef574c61cd4f81af6cf8 (diff) | |
Merge branch 'for-5.4/ish' into for-linus
- fixes for handling power management for intel-ish devices with NO_D3 flag
set, from Zhang Lixu
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/intel-ish-hid/ipc/hw-ish.h')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h index 5792a104000a..6c1e6110867f 100644 --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h @@ -78,5 +78,6 @@ irqreturn_t ish_irq_handler(int irq, void *dev_id); struct ishtp_device *ish_dev_init(struct pci_dev *pdev); int ish_hw_start(struct ishtp_device *dev); void ish_device_disable(struct ishtp_device *dev); +int ish_disable_dma(struct ishtp_device *dev); #endif /* _ISHTP_HW_ISH_H_ */ |