diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 14:20:18 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 14:20:18 -0400 |
| commit | 7199cad3342219b0ff9f9c2f249810fb3f6d6b5e (patch) | |
| tree | bf59d6617520648240b1ca680c1d118678b8cd02 | |
| parent | c4fb0a4162f3bcf93f369b44e4c8b7e09538ece6 (diff) | |
| download | longterm-queue-4.12-7199cad3342219b0ff9f9c2f249810fb3f6d6b5e.tar.gz | |
usb: da8xx context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/usb-musb-da8xx-fix-babble-condition-handling.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/usb-musb-da8xx-fix-babble-condition-handling.patch b/queue/usb-musb-da8xx-fix-babble-condition-handling.patch index 3465f1d..6970da1 100644 --- a/queue/usb-musb-da8xx-fix-babble-condition-handling.patch +++ b/queue/usb-musb-da8xx-fix-babble-condition-handling.patch @@ -1,4 +1,4 @@ -From bd3486ded7a0c313a6575343e6c2b21d14476645 Mon Sep 17 00:00:00 2001 +From be1f5e39e97e526245e15220b4df3a3822e41d6d Mon Sep 17 00:00:00 2001 From: Bin Liu <b-liu@ti.com> Date: Tue, 5 Dec 2017 08:45:30 -0600 Subject: [PATCH] usb: musb: da8xx: fix babble condition handling @@ -19,15 +19,16 @@ properly. Cc: stable@vger.kernel.org # v3.16+ Signed-off-by: Bin Liu <b-liu@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c -index 0397606a211b..6c036de63272 100644 +index df88123274ca..92ed39b63fc2 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c -@@ -284,7 +284,15 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) +@@ -305,7 +305,15 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE; portstate(musb->port1_status |= USB_PORT_STAT_POWER); - del_timer(&musb->dev_timer); + del_timer(&otg_workaround); - } else { + } else if (!(musb->int_usb & MUSB_INTR_BABBLE)) { + /* |