projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[platform/kernel/linux-rpi.git]
/
drivers
/
hid
/
hid-google-hammer.c
diff --git
a/drivers/hid/hid-google-hammer.c
b/drivers/hid/hid-google-hammer.c
index
7fd3420
..
ff40f1e
100644
(file)
--- a/
drivers/hid/hid-google-hammer.c
+++ b/
drivers/hid/hid-google-hammer.c
@@
-60,7
+60,7
@@
static int cbas_ec_query_base(struct cros_ec_device *ec_dev, bool get_state,
struct cros_ec_command *msg;
int ret;
- msg = kzalloc(s
izeof(*msg) + max(sizeof(u32), sizeof(*params
)),
+ msg = kzalloc(s
truct_size(msg, data, max(sizeof(u32), sizeof(*params)
)),
GFP_KERNEL);
if (!msg)
return -ENOMEM;