Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

1 files changed, 10 insertions, 3 deletions

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),