9 files changed, 44 insertions, 51 deletions

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 503201764f6b..02106bebd5c1 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -967,6 +967,7 @@ static int dummy_udc_resume (struct device *dev)
 
 static struct device_driver dummy_udc_driver = {
         .name           = (char *) gadget_name,
+        .owner          = THIS_MODULE,
         .bus            = &platform_bus_type,
         .probe          = dummy_udc_probe,
         .remove         = dummy_udc_remove,
@@ -1751,7 +1752,7 @@ static int dummy_hub_control (
         return retval;
 }
 
-static int dummy_hub_suspend (struct usb_hcd *hcd)
+static int dummy_bus_suspend (struct usb_hcd *hcd)
 {
         struct dummy *dum = hcd_to_dummy (hcd);
 
@@ -1762,7 +1763,7 @@ static int dummy_hub_suspend (struct usb_hcd *hcd)
         return 0;
 }
 
-static int dummy_hub_resume (struct usb_hcd *hcd)
+static int dummy_bus_resume (struct usb_hcd *hcd)
 {
         struct dummy *dum = hcd_to_dummy (hcd);
 
@@ -1894,8 +1895,8 @@ static const struct hc_driver dummy_hcd = {
 
         .hub_status_data =      dummy_hub_status,
         .hub_control =          dummy_hub_control,
-        .hub_suspend =          dummy_hub_suspend,
-        .hub_resume =           dummy_hub_resume,
+        .bus_suspend =          dummy_bus_suspend,
+        .bus_resume =           dummy_bus_resume,
 };
 
 static int dummy_hcd_probe (struct device *dev)
@@ -1936,13 +1937,6 @@ static int dummy_hcd_suspend (struct device *dev, pm_message_t state)
         dev_dbg (dev, "%s\n", __FUNCTION__);
         hcd = dev_get_drvdata (dev);
 
-#ifndef CONFIG_USB_SUSPEND
-        /* Otherwise this would never happen */
-        usb_lock_device (hcd->self.root_hub);
-        dummy_hub_suspend (hcd);
-        usb_unlock_device (hcd->self.root_hub);
-#endif
-
         hcd->state = HC_STATE_SUSPENDED;
         return 0;
 }
@@ -1955,19 +1949,13 @@ static int dummy_hcd_resume (struct device *dev)
         hcd = dev_get_drvdata (dev);
         hcd->state = HC_STATE_RUNNING;
 
-#ifndef CONFIG_USB_SUSPEND
-        /* Otherwise this would never happen */
-        usb_lock_device (hcd->self.root_hub);
-        dummy_hub_resume (hcd);
-        usb_unlock_device (hcd->self.root_hub);
-#endif
-
         usb_hcd_poll_rh_status (hcd);
         return 0;
 }
 
 static struct device_driver dummy_hcd_driver = {
         .name           = (char *) driver_name,
+        .owner          = THIS_MODULE,
         .bus            = &platform_bus_type,
         .probe          = dummy_hcd_probe,
         .remove         = dummy_hcd_remove,
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index f1024e804d5c..8f402f85e1ca 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2533,6 +2533,7 @@ static struct usb_gadget_driver eth_driver = {
 
         .driver         = {
                 .name           = (char *) shortname,
+                .owner          = THIS_MODULE,
                 // .shutdown = ...
                 // .suspend = ...
                 // .resume = ...
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index a41d9d4baee3..ea09aaa3cab6 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -224,6 +224,7 @@
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/kthread.h>
 #include <linux/limits.h>
 #include <linux/list.h>
 #include <linux/module.h>
@@ -669,7 +670,6 @@ struct fsg_dev {
         wait_queue_head_t       thread_wqh;
         int                     thread_wakeup_needed;
         struct completion       thread_notifier;
-        int                     thread_pid;
         struct task_struct      *thread_task;
         sigset_t                thread_signal_mask;
 
@@ -1084,7 +1084,6 @@ static void wakeup_thread(struct fsg_dev *fsg)
 static void raise_exception(struct fsg_dev *fsg, enum fsg_state new_state)
 {
         unsigned long           flags;
-        struct task_struct      *thread_task;
 
         /* Do nothing if a higher-priority exception is already in progress.
          * If a lower-or-equal priority exception is in progress, preempt it
@@ -1093,9 +1092,9 @@ static void raise_exception(struct fsg_dev *fsg, enum fsg_state new_state)
         if (fsg->state <= new_state) {
                 fsg->exception_req_tag = fsg->ep0_req_tag;
                 fsg->state = new_state;
-                thread_task = fsg->thread_task;
-                if (thread_task)
-                        send_sig_info(SIGUSR1, SEND_SIG_FORCED, thread_task);
+                if (fsg->thread_task)
+                        send_sig_info(SIGUSR1, SEND_SIG_FORCED,
+                                        fsg->thread_task);
         }
         spin_unlock_irqrestore(&fsg->lock, flags);
 }
@@ -3383,11 +3382,6 @@ static int fsg_main_thread(void *fsg_)
 {
         struct fsg_dev          *fsg = (struct fsg_dev *) fsg_;
 
-        fsg->thread_task = current;
-
-        /* Release all our userspace resources */
-        daemonize("file-storage-gadget");
-
         /* Allow the thread to be killed by a signal, but set the signal mask
          * to block everything but INT, TERM, KILL, and USR1. */
         siginitsetinv(&fsg->thread_signal_mask, sigmask(SIGINT) |
@@ -3400,9 +3394,6 @@ static int fsg_main_thread(void *fsg_)
          * that expects a __user pointer and it will work okay. */
         set_fs(get_ds());
 
-        /* Wait for the gadget registration to finish up */
-        wait_for_completion(&fsg->thread_notifier);
-
         /* The main loop */
         while (fsg->state != FSG_STATE_TERMINATED) {
                 if (exception_in_progress(fsg) || signal_pending(current)) {
@@ -3440,8 +3431,9 @@ static int fsg_main_thread(void *fsg_)
                 spin_unlock_irq(&fsg->lock);
                 }
 
+        spin_lock_irq(&fsg->lock);
         fsg->thread_task = NULL;
-        flush_signals(current);
+        spin_unlock_irq(&fsg->lock);
 
         /* In case we are exiting because of a signal, unregister the
          * gadget driver and close the backing file. */
@@ -3831,12 +3823,11 @@ static int __init fsg_bind(struct usb_gadget *gadget)
 
         /* Create the LUNs, open their backing files, and register the
          * LUN devices in sysfs. */
-        fsg->luns = kmalloc(i * sizeof(struct lun), GFP_KERNEL);
+        fsg->luns = kzalloc(i * sizeof(struct lun), GFP_KERNEL);
         if (!fsg->luns) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(fsg->luns, 0, i * sizeof(struct lun));
         fsg->nluns = i;
 
         for (i = 0; i < fsg->nluns; ++i) {
@@ -3959,10 +3950,12 @@ static int __init fsg_bind(struct usb_gadget *gadget)
                 sprintf(&serial[i], "%02X", c);
         }
 
-        if ((rc = kernel_thread(fsg_main_thread, fsg, (CLONE_VM | CLONE_FS |
-                        CLONE_FILES))) < 0)
+        fsg->thread_task = kthread_create(fsg_main_thread, fsg,
+                        "file-storage-gadget");
+        if (IS_ERR(fsg->thread_task)) {
+                rc = PTR_ERR(fsg->thread_task);
                 goto out;
-        fsg->thread_pid = rc;
+        }
 
         INFO(fsg, DRIVER_DESC ", version: " DRIVER_VERSION "\n");
         INFO(fsg, "Number of LUNs=%d\n", fsg->nluns);
@@ -3994,7 +3987,12 @@ static int __init fsg_bind(struct usb_gadget *gadget)
         DBG(fsg, "removable=%d, stall=%d, buflen=%u\n",
                         mod_data.removable, mod_data.can_stall,
                         mod_data.buflen);
-        DBG(fsg, "I/O thread pid: %d\n", fsg->thread_pid);
+        DBG(fsg, "I/O thread pid: %d\n", fsg->thread_task->pid);
+
+        set_bit(REGISTERED, &fsg->atomic_bitflags);
+
+        /* Tell the thread to start working */
+        wake_up_process(fsg->thread_task);
         return 0;
 
 autoconf_fail:
@@ -4046,6 +4044,7 @@ static struct usb_gadget_driver		fsg_driver = {
 
         .driver         = {
                 .name           = (char *) shortname,
+                .owner          = THIS_MODULE,
                 // .release = ...
                 // .suspend = ...
                 // .resume = ...
@@ -4057,10 +4056,9 @@ static int __init fsg_alloc(void)
 {
         struct fsg_dev          *fsg;
 
-        fsg = kmalloc(sizeof *fsg, GFP_KERNEL);
+        fsg = kzalloc(sizeof *fsg, GFP_KERNEL);
         if (!fsg)
                 return -ENOMEM;
-        memset(fsg, 0, sizeof *fsg);
         spin_lock_init(&fsg->lock);
         init_rwsem(&fsg->filesem);
         init_waitqueue_head(&fsg->thread_wqh);
@@ -4086,15 +4084,9 @@ static int __init fsg_init(void)
         if ((rc = fsg_alloc()) != 0)
                 return rc;
         fsg = the_fsg;
-        if ((rc = usb_gadget_register_driver(&fsg_driver)) != 0) {
+        if ((rc = usb_gadget_register_driver(&fsg_driver)) != 0)
                 fsg_free(fsg);
-                return rc;
-        }
-        set_bit(REGISTERED, &fsg->atomic_bitflags);
-
-        /* Tell the thread to start working */
-        complete(&fsg->thread_notifier);
-        return 0;
+        return rc;
 }
 module_init(fsg_init);
 
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index b0f3cd63e3b9..654469778ab5 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1970,6 +1970,7 @@ MODULE_DEVICE_TABLE (pci, pci_ids);
 static struct pci_driver goku_pci_driver = {
         .name =         (char *) driver_name,
         .id_table =     pci_ids,
+        .owner =        THIS_MODULE,
 
         .probe =        goku_probe,
         .remove =       goku_remove,
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index 012d1e5f1524..9b3673904daf 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -2140,6 +2140,7 @@ static int lh7a40x_udc_remove(struct device *_dev)
 
 static struct device_driver udc_driver = {
         .name = (char *)driver_name,
+        .owner = THIS_MODULE,
         .bus = &platform_bus_type,
         .probe = lh7a40x_udc_probe,
         .remove = lh7a40x_udc_remove
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index c32e1f7476da..0dc6bb00bf72 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2948,6 +2948,7 @@ MODULE_DEVICE_TABLE (pci, pci_ids);
 static struct pci_driver net2280_pci_driver = {
         .name =         (char *) driver_name,
         .id_table =     pci_ids,
+        .owner =        THIS_MODULE,
 
         .probe =        net2280_probe,
         .remove =       net2280_remove,
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index b7885dc0f42f..41c96b0afbb3 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -691,7 +691,7 @@ static void next_out_dma(struct omap_ep *ep, struct omap_req *req)
 }
 
 static void
-finish_out_dma(struct omap_ep *ep, struct omap_req *req, int status)
+finish_out_dma(struct omap_ep *ep, struct omap_req *req, int status, int one)
 {
         u16     count;
 
@@ -699,6 +699,8 @@ finish_out_dma(struct omap_ep *ep, struct omap_req *req, int status)
                 ep->dma_counter = (u16) (req->req.dma + req->req.actual);
         count = dma_dest_len(ep, req->req.dma + req->req.actual);
         count += req->req.actual;
+        if (one)
+                count--;
         if (count <= req->req.length)
                 req->req.actual = count;
 
@@ -747,7 +749,7 @@ static void dma_irq(struct omap_udc *udc, u16 irq_src)
                 if (!list_empty(&ep->queue)) {
                         req = container_of(ep->queue.next,
                                         struct omap_req, queue);
-                        finish_out_dma(ep, req, 0);
+                        finish_out_dma(ep, req, 0, dman_stat & UDC_DMA_RX_SB);
                 }
                 UDC_IRQ_SRC_REG = UDC_RXN_EOT;
 
@@ -925,7 +927,7 @@ static void dma_channel_release(struct omap_ep *ep)
                 while (UDC_RXDMA_CFG_REG & mask)
                         udelay(10);
                 if (req)
-                        finish_out_dma(ep, req, -ECONNRESET);
+                        finish_out_dma(ep, req, -ECONNRESET, 0);
         }
         omap_free_dma(ep->lch);
         ep->dma_channel = 0;
@@ -1786,8 +1788,12 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
                                         udc->driver->suspend(&udc->gadget);
                                         spin_lock(&udc->lock);
                                 }
+                                if (udc->transceiver)
+                                        otg_set_suspend(udc->transceiver, 1);
                         } else {
                                 VDBG("resume\n");
+                                if (udc->transceiver)
+                                        otg_set_suspend(udc->transceiver, 0);
                                 if (udc->gadget.speed == USB_SPEED_FULL
                                                 && udc->driver->resume) {
                                         spin_unlock(&udc->lock);
@@ -2943,6 +2949,7 @@ static int omap_udc_resume(struct device *dev)
 
 static struct device_driver udc_driver = {
         .name           = (char *) driver_name,
+        .owner          = THIS_MODULE,
         .bus            = &platform_bus_type,
         .probe          = omap_udc_probe,
         .remove         = __exit_p(omap_udc_remove),
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 647028590b23..f83a9262f953 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -2631,6 +2631,7 @@ static int pxa2xx_udc_resume(struct device *dev)
 
 static struct device_driver udc_driver = {
         .name           = "pxa2xx-udc",
+        .owner          = THIS_MODULE,
         .bus            = &platform_bus_type,
         .probe          = pxa2xx_udc_probe,
         .shutdown       = pxa2xx_udc_shutdown,
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index ec9c424f1d97..6c58636e914b 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -1302,6 +1302,7 @@ static struct usb_gadget_driver zero_driver = {
 
         .driver         = {
                 .name           = (char *) shortname,
+                .owner          = THIS_MODULE,
                 // .shutdown = ...
                 // .suspend = ...
                 // .resume = ...