aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-04-30 10:39:17 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-14 06:44:18 -0700
commit32bb39f80ffb6b63c78b418bec35a2ce1fc0abe1 (patch)
treed6b20c325e328e09fd8ed7790d4e1dac3a911a7a /include
parent588256df90f26647828489e45d82b72e97d624e9 (diff)
HID: fix return value of hidraw_report_event() when !CONFIG_HIDRAW
commit d6d7c873529abd622897cad5e36f1fd7d82f5110 upstream. Commit b6787242f327 ("HID: hidraw: add proper error handling to raw event reporting") forgot to update the static inline version of hidraw_report_event() for the case when CONFIG_HIDRAW is unset. Fix that up. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Cc: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/hidraw.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hidraw.h b/include/linux/hidraw.h
index 9cdc9b67ff4..45e9fcb8d87 100644
--- a/include/linux/hidraw.h
+++ b/include/linux/hidraw.h
@@ -82,7 +82,7 @@ void hidraw_disconnect(struct hid_device *);
#else
static inline int hidraw_init(void) { return 0; }
static inline void hidraw_exit(void) { }
-static inline int hidraw_report_event(struct hid_device *hid, u8 *data, int len) { }
+static inline int hidraw_report_event(struct hid_device *hid, u8 *data, int len) { return 0; }
static inline int hidraw_connect(struct hid_device *hid) { return -1; }
static inline void hidraw_disconnect(struct hid_device *hid) { }
#endif