--- /dev/null
+From d88bb4defd4846ab3cdac1567aa3ab23997305cd Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 17 Oct 2017 16:12:49 +0200
+Subject: Revert "usb: gadget: inode.c: fix unbalanced spin_lock in ep0_write"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit abb540b5397674243994c5327146b6fed7339b71 which is
+commit b7bd98b7db9f upstream. I had added it to make another patch
+apply cleanly, but as Ben points out, that was wrong.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Cc: David Eccher <d.eccher@gmail.com>
+Cc: Felipe Balbi <balbi@ti.com>
+Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
+
+---
+ drivers/usb/gadget/legacy/inode.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/gadget/legacy/inode.c
++++ b/drivers/usb/gadget/legacy/inode.c
+@@ -1231,10 +1231,11 @@ ep0_write (struct file *fd, const char _
+ dev->gadget->ep0, dev->req,
+ GFP_KERNEL);
+ }
+- spin_lock_irq(&dev->lock);
+ --dev->udc_usage;
+ if (retval < 0) {
++ spin_lock_irq (&dev->lock);
+ clean_req (dev->gadget->ep0, dev->req);
++ spin_unlock_irq (&dev->lock);
+ } else
+ retval = len;
+