diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-20 01:02:01 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-20 01:02:01 +0100 |
commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
tree | ea409366a5208aced495bc0516a08b81fd43222e /drivers/hid/hid-lg4ff.c | |
parent | Input: wacom - fix physical size calculation for 3rd-gen Bamboo (diff) | |
parent | Input: ili210x - add support for Ilitek ILI210x based touchscreens (diff) | |
download | linux-10ce3cc919f50c2043b41ca968b43c26a3672600.tar.xz linux-10ce3cc919f50c2043b41ca968b43c26a3672600.zip |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/hid/hid-lg4ff.c')
-rw-r--r-- | drivers/hid/hid-lg4ff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c index 103f30d93f76..6ecc9e220440 100644 --- a/drivers/hid/hid-lg4ff.c +++ b/drivers/hid/hid-lg4ff.c @@ -430,7 +430,7 @@ int lg4ff_init(struct hid_device *hid) } /* Add the device to device_list */ - entry = (struct lg4ff_device_entry *)kzalloc(sizeof(struct lg4ff_device_entry), GFP_KERNEL); + entry = kzalloc(sizeof(struct lg4ff_device_entry), GFP_KERNEL); if (!entry) { hid_err(hid, "Cannot add device, insufficient memory.\n"); return -ENOMEM; |