Merge git://git.infradead.org/hdrinstall-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / misc / cytherm.c

diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index b33044d56a1eaba415fbe8fc6a21537b14119229..b20bec445552007b23d0008bc6998a3f717244af 100644 (file)
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -14,7 +14,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -50,7 +49,6 @@ static void cytherm_disconnect(struct usb_interface *interface);
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver cytherm_driver = {
-       .owner =        THIS_MODULE,
        .name =         "cytherm",
        .probe =        cytherm_probe,
        .disconnect =   cytherm_disconnect,
@@ -352,12 +350,11 @@ static int cytherm_probe(struct usb_interface *interface,
        struct usb_cytherm *dev = NULL;
        int retval = -ENOMEM;
 
-       dev = kmalloc (sizeof(struct usb_cytherm), GFP_KERNEL);
+       dev = kzalloc (sizeof(struct usb_cytherm), GFP_KERNEL);
        if (dev == NULL) {
                dev_err (&interface->dev, "Out of memory\n");
                goto error;
        }
-       memset (dev, 0x00, sizeof (*dev));
 
        dev->udev = usb_get_dev(udev);