1cd8ae19a9
Add backported patched from 5.x from usb related fixes Up kernel version to most recent lts
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From ad408a1596b45868e38d0504f2ec1d5fb06f17d4 Mon Sep 17 00:00:00 2001
|
|
From: Guenter Roeck <linux@roeck-us.net>
|
|
Date: Wed, 29 May 2019 13:54:43 -0700
|
|
Subject: [PATCH 52/53] Revert "usb: dwc2: host: Setting qtd to NULL after
|
|
freeing it"
|
|
|
|
This reverts commit b0d659022e5c96ee5c4bd62d22d3da2d66de306b.
|
|
|
|
The reverted commit does nothing but adding two unnecessary lines
|
|
of code. It sets a local variable to NULL in two functions, but
|
|
that variable is not used anywhere in the rest of those functions.
|
|
This is just confusing, so let's remove it.
|
|
|
|
Cc: Vardan Mikayelyan <mvardan@synopsys.com>
|
|
Cc: John Youn <johnyoun@synopsys.com>
|
|
Cc: Douglas Anderson <dianders@chromiun.org>
|
|
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|
Acked-by: Minas Harutyunyan <hminas@synopsys.com>
|
|
Reviewed-by: Douglas Anderson <dianders@chromium.org>
|
|
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
|
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|
---
|
|
drivers/usb/dwc2/hcd.c | 1 -
|
|
drivers/usb/dwc2/hcd.h | 1 -
|
|
2 files changed, 2 deletions(-)
|
|
|
|
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
|
|
index 4c78a390c958..ee144ff8af5b 100644
|
|
--- a/drivers/usb/dwc2/hcd.c
|
|
+++ b/drivers/usb/dwc2/hcd.c
|
|
@@ -4685,7 +4685,6 @@ static int _dwc2_hcd_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
|
|
spin_unlock_irqrestore(&hsotg->lock, flags);
|
|
urb->hcpriv = NULL;
|
|
kfree(qtd);
|
|
- qtd = NULL;
|
|
fail1:
|
|
if (qh_allocated) {
|
|
struct dwc2_qtd *qtd2, *qtd2_tmp;
|
|
diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
|
|
index ce6445a06588..8ca6d12a6f57 100644
|
|
--- a/drivers/usb/dwc2/hcd.h
|
|
+++ b/drivers/usb/dwc2/hcd.h
|
|
@@ -582,7 +582,6 @@ static inline void dwc2_hcd_qtd_unlink_and_free(struct dwc2_hsotg *hsotg,
|
|
{
|
|
list_del(&qtd->qtd_list_entry);
|
|
kfree(qtd);
|
|
- qtd = NULL;
|
|
}
|
|
|
|
/* Descriptor DMA support functions */
|
|
--
|
|
2.11.0
|
|
|