Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / input / hid-tmff.c

diff --git a/drivers/usb/input/hid-tmff.c b/drivers/usb/input/hid-tmff.c
index 023fd5ac31c8ecf15bc8a95fa6055d5dbcb924db..534425c69c0a502b1a7f86be0811446147c0afd7 100644 (file)
--- a/drivers/usb/input/hid-tmff.c
+++ b/drivers/usb/input/hid-tmff.c
@@ -113,11 +113,10 @@ int hid_tmff_init(struct hid_device *hid)
        struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list);
        struct input_dev *input_dev = hidinput->input;
 
-       private = kmalloc(sizeof(struct tmff_device), GFP_KERNEL);
+       private = kzalloc(sizeof(struct tmff_device), GFP_KERNEL);
        if (!private)
                return -ENOMEM;
 
-       memset(private, 0, sizeof(struct tmff_device));
        hid->ff_private = private;
 
        /* Find the report to use */