From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 23 Mar 2020 07:04:08 +0000 (+0100)
Subject: Merge 5.6-rc7 into usb-next
X-Git-Tag: v5.7-rc1~192^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2e971d884e7b7e65162788b8f3b7801cd8bc137;p=thirdparty%2Flinux.git

Merge 5.6-rc7 into usb-next

We need the USB fixes in here as well.

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

d2e971d884e7b7e65162788b8f3b7801cd8bc137
diff --cc drivers/usb/chipidea/udc.c
index ffa6caee1f3bf,4c4ac30db4987..921bcf14dc061
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@@ -1530,12 -1530,11 +1530,11 @@@ static const struct usb_ep_ops usb_ep_o
  static void ci_hdrc_gadget_connect(struct usb_gadget *_gadget, int is_active)
  {
  	struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);
- 	unsigned long flags;
  
  	if (is_active) {
 -		pm_runtime_get_sync(&_gadget->dev);
 +		pm_runtime_get_sync(ci->dev);
  		hw_device_reset(ci);
- 		spin_lock_irqsave(&ci->lock, flags);
+ 		spin_lock_irq(&ci->lock);
  		if (ci->driver) {
  			hw_device_state(ci, ci->ep0out->qh.dma);
  			usb_gadget_set_state(_gadget, USB_STATE_POWERED);