diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 18:56:24 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 18:56:24 +0200 |
| commit | ee5f68e6c2f183e6aade0e9c57af13d5eff44f2f (patch) | |
| tree | de4132918ec7b033c4981e2ba4aea9027816bdb9 /include/linux/hid.h | |
| parent | f74346a04b79c9a5e50a2ee5e923b94195975d17 (diff) | |
| parent | 0a7f364e812285246cd617a51194a3f8bd0e8daa (diff) | |
Merge branch 'for-3.15/ll-driver-new-callbacks' into for-linus
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 31b9d299ef6c..003cc8e89831 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -700,8 +700,14 @@ struct hid_ll_driver { struct hid_report *report, int reqtype); int (*wait)(struct hid_device *hdev); - int (*idle)(struct hid_device *hdev, int report, int idle, int reqtype); + int (*raw_request) (struct hid_device *hdev, unsigned char reportnum, + __u8 *buf, size_t len, unsigned char rtype, + int reqtype); + + int (*output_report) (struct hid_device *hdev, __u8 *buf, size_t len); + + int (*idle)(struct hid_device *hdev, int report, int idle, int reqtype); }; #define PM_HINT_FULLON 1<<5 |