diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-07 13:13:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-07 13:13:03 -0700 |
| commit | 4c2f503aade27ebf12f5733a583d711f99dc5ec1 (patch) | |
| tree | acb642edcb5dbba6725da02bf70b204d20d75b41 /drivers/hid/hid-rmi.c | |
| parent | 92556e60394a78c2c0d6958602271676094858bc (diff) | |
| parent | 3179e8e684603645b573fdc46139473d5ee4b189 (diff) | |
| download | op-kernel-dev-4c2f503aade27ebf12f5733a583d711f99dc5ec1.zip op-kernel-dev-4c2f503aade27ebf12f5733a583d711f99dc5ec1.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
"A few tiny HID subsystem fixes for 3.16"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: use multi input quirk for 22b9:2968
HID: sensor-hub: fix potential memory leak
HID: usbhid: quirk for PM1610 and PM1640 Touchscreen.
HID: rmi: Protect PM-only functions by #ifdef CONFIG_PM
HID: sensor-hub: introduce Kconfig dependency on IOMEM
HID: sensor-hub: make dyn_callback_lock IRQ-safe
Diffstat (limited to 'drivers/hid/hid-rmi.c')
| -rw-r--r-- | drivers/hid/hid-rmi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 2451c7e..578bbe6 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -428,6 +428,7 @@ static int rmi_raw_event(struct hid_device *hdev, return 0; } +#ifdef CONFIG_PM static int rmi_post_reset(struct hid_device *hdev) { return rmi_set_mode(hdev, RMI_MODE_ATTN_REPORTS); @@ -437,6 +438,7 @@ static int rmi_post_resume(struct hid_device *hdev) { return rmi_set_mode(hdev, RMI_MODE_ATTN_REPORTS); } +#endif /* CONFIG_PM */ #define RMI4_MAX_PAGE 0xff #define RMI4_PAGE_SIZE 0x0100 |
