Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index e64479f882a5..aa3707bdebb4 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -938,8 +938,11 @@ ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr)
                         struct usb_ep           *ep = dev->gadget->ep0;
                         struct usb_request      *req = dev->req;
 
-                        if ((retval = setup_req (ep, req, 0)) == 0)
-                                retval = usb_ep_queue (ep, req, GFP_ATOMIC);
+                        if ((retval = setup_req (ep, req, 0)) == 0) {
+                                spin_unlock_irq (&dev->lock);
+                                retval = usb_ep_queue (ep, req, GFP_KERNEL);
+                                spin_lock_irq (&dev->lock);
+                        }
                         dev->state = STATE_DEV_CONNECTED;
 
                         /* assume that was SET_CONFIGURATION */
@@ -1457,8 +1460,11 @@ delegate:
                                                         w_length);
                                 if (value < 0)
                                         break;
+
+                                spin_unlock (&dev->lock);
                                 value = usb_ep_queue (gadget->ep0, dev->req,
-                                                        GFP_ATOMIC);
+                                                        GFP_KERNEL);
+                                spin_lock (&dev->lock);
                                 if (value < 0) {
                                         clean_req (gadget->ep0, dev->req);
                                         break;
@@ -1481,11 +1487,14 @@ delegate:
         if (value >= 0 && dev->state != STATE_DEV_SETUP) {
                 req->length = value;
                 req->zero = value < w_length;
-                value = usb_ep_queue (gadget->ep0, req, GFP_ATOMIC);
+
+                spin_unlock (&dev->lock);
+                value = usb_ep_queue (gadget->ep0, req, GFP_KERNEL);
                 if (value < 0) {
                         DBG (dev, "ep_queue --> %d\n", value);
                         req->status = 0;
                 }
+                return value;
         }
 
         /* device stalls when value < 0 */