1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index ae7a1c0f5748..51424f66a765 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -1119,7 +1119,7 @@ zero_autoresume (unsigned long _dev)
 
 /*-------------------------------------------------------------------------*/
 
-static void
+static void __exit
 zero_unbind (struct usb_gadget *gadget)
 {
         struct zero_dev         *dev = get_gadget_data (gadget);
@@ -1136,7 +1136,7 @@ zero_unbind (struct usb_gadget *gadget)
         set_gadget_data (gadget, NULL);
 }
 
-static int
+static int __init
 zero_bind (struct usb_gadget *gadget)
 {
         struct zero_dev         *dev;
@@ -1188,10 +1188,9 @@ autoconf_fail:
 
 
         /* ok, we made sense of the hardware ... */
-        dev = kmalloc (sizeof *dev, SLAB_KERNEL);
+        dev = kzalloc(sizeof(*dev), SLAB_KERNEL);
         if (!dev)
                 return -ENOMEM;
-        memset (dev, 0, sizeof *dev);
         spin_lock_init (&dev->lock);
         dev->gadget = gadget;
         set_gadget_data (gadget, dev);
@@ -1224,12 +1223,6 @@ autoconf_fail:
                 loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
         }
 
-        if (gadget->is_otg) {
-                otg_descriptor.bmAttributes |= USB_OTG_HNP,
-                source_sink_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
-                loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
-        }
-
         usb_gadget_set_selfpowered (gadget);
 
         init_timer (&dev->resume);
@@ -1294,7 +1287,7 @@ static struct usb_gadget_driver zero_driver = {
 #endif
         .function       = (char *) longname,
         .bind           = zero_bind,
-        .unbind         = zero_unbind,
+        .unbind         = __exit_p(zero_unbind),
 
         .setup          = zero_setup,
         .disconnect     = zero_disconnect,