Merge branch 'master' into fixes

[deliverable/linux.git] / drivers / hid / hid-lg4ff.c

diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c
index 103f30d93f76adb154518f5656bba6bbd98e24e5..6ecc9e2204409c1451e90086a4edd7f0639cdb01 100644 (file)
--- 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;