[PATCH] git-scsi-misc: min() warning fix

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

diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 925f5aba06f583555c4f521c7bc2e809caf9f921..6dd6666961787434653fcde4add8eb0e25bb2ab0 100644 (file)
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -257,9 +257,8 @@ static int hiddev_open(struct inode * inode, struct file * file) {
        if (i >= HIDDEV_MINORS || !hiddev_table[i])
                return -ENODEV;
 
-       if (!(list = kmalloc(sizeof(struct hiddev_list), GFP_KERNEL)))
+       if (!(list = kzalloc(sizeof(struct hiddev_list), GFP_KERNEL)))
                return -ENOMEM;
-       memset(list, 0, sizeof(struct hiddev_list));
 
        list->hiddev = hiddev_table[i];
        list->next = hiddev_table[i]->list;
@@ -754,9 +753,8 @@ int hiddev_connect(struct hid_device *hid)
        if (i == hid->maxcollection && (hid->quirks & HID_QUIRK_HIDDEV) == 0)
                return -1;
 
-       if (!(hiddev = kmalloc(sizeof(struct hiddev), GFP_KERNEL)))
+       if (!(hiddev = kzalloc(sizeof(struct hiddev), GFP_KERNEL)))
                return -1;
-       memset(hiddev, 0, sizeof(struct hiddev));
 
        retval = usb_register_dev(hid->intf, &hiddev_class);
        if (retval) {