Merge branch 'master'

3 files changed, 13 insertions, 4 deletions

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 9a4edc5657aa..0aab7d24c768 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -135,6 +135,7 @@ struct dev_data {
                                         setup_out_ready : 1,
                                         setup_out_error : 1,
                                         setup_abort : 1;
+        unsigned                        setup_wLength;
 
         /* the rest is basically write-once */
         struct usb_config_descriptor    *config, *hs_config;
@@ -942,6 +943,7 @@ static int setup_req (struct usb_ep *ep, struct usb_request *req, u16 len)
         }
         req->complete = ep0_complete;
         req->length = len;
+        req->zero = 0;
         return 0;
 }
 
@@ -1161,10 +1163,13 @@ ep0_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
                                 spin_unlock_irq (&dev->lock);
                                 if (copy_from_user (dev->req->buf, buf, len))
                                         retval = -EFAULT;
-                                else
+                                else {
+                                        if (len < dev->setup_wLength)
+                                                dev->req->zero = 1;
                                         retval = usb_ep_queue (
                                                 dev->gadget->ep0, dev->req,
                                                 GFP_KERNEL);
+                                }
                                 if (retval < 0) {
                                         spin_lock_irq (&dev->lock);
                                         clean_req (dev->gadget->ep0, dev->req);
@@ -1483,6 +1488,7 @@ unrecognized:
 delegate:
                         dev->setup_in = (ctrl->bRequestType & USB_DIR_IN)
                                                 ? 1 : 0;
+                        dev->setup_wLength = w_length;
                         dev->setup_out_ready = 0;
                         dev->setup_out_error = 0;
                         value = 0;
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index c32e1f7476da..67b13ab2f3f5 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -47,6 +47,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 2fc110d3ad5a..ae7a1c0f5748 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -165,8 +165,8 @@ static unsigned buflen = 4096;
 static unsigned qlen = 32;
 static unsigned pattern = 0;
 
-module_param (buflen, uint, S_IRUGO|S_IWUSR);
-module_param (qlen, uint, S_IRUGO|S_IWUSR);
+module_param (buflen, uint, S_IRUGO);
+module_param (qlen, uint, S_IRUGO);
 module_param (pattern, uint, S_IRUGO|S_IWUSR);
 
 /*
@@ -1127,8 +1127,10 @@ zero_unbind (struct usb_gadget *gadget)
         DBG (dev, "unbind\n");
 
         /* we've already been disconnected ... no i/o is active */
-        if (dev->req)
+        if (dev->req) {
+                dev->req->length = USB_BUFSIZ;
                 free_ep_req (gadget->ep0, dev->req);
+        }
         del_timer_sync (&dev->resume);
         kfree (dev);
         set_gadget_data (gadget, NULL);