projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
hid
/
hid-egalax.c
diff --git
a/drivers/hid/hid-egalax.c
b/drivers/hid/hid-egalax.c
index
bbab6cf
..
72b1dd8
100644
(file)
--- a/
drivers/hid/hid-egalax.c
+++ b/
drivers/hid/hid-egalax.c
@@
-221,7
+221,7
@@
static int egalax_probe(struct hid_device *hdev, const struct hid_device_id *id)
struct egalax_data *td;
struct hid_report *report;
- td = k
m
alloc(sizeof(struct egalax_data), GFP_KERNEL);
+ td = k
z
alloc(sizeof(struct egalax_data), GFP_KERNEL);
if (!td) {
hid_err(hdev, "cannot allocate eGalax data\n");
return -ENOMEM;