UPSTREAM: usb: dwc2: Fix issues in dwc2_complete_non_isoc_xfer_ddma()

Fixes a static analysis issue in dwc2_complete_non_isoc_xfer_ddma(). The
qtd was being passed to a function after being freed. It was not being
used in the function so this doesn't fix any bugs. But it fixes up the
warning and makes the code safer by setting qtd to NULL and not using it
at all.

Change-Id: I5224d5b7854c23cc0d0931b5a131f93b9a2ce8c8
Reported-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 1fc659894994c7faa67e51a4b5a981ab4cf0f3a5)

diff --git a/drivers/usb/dwc2/hcd_ddma.c b/drivers/usb/dwc2/hcd_ddma.c
index 27350d0b1c505493fa1835b16e168f8142751414..0e1d42b5dec5289630c1eee94a3942c1c7b64820 100644 (file)
--- a/drivers/usb/dwc2/hcd_ddma.c
+++ b/drivers/usb/dwc2/hcd_ddma.c
@@ -1245,8 +1245,10 @@ static void dwc2_complete_non_isoc_xfer_ddma(struct dwc2_hsotg *hsotg,
                for (i = 0; i < qtd_desc_count; i++) {
                        if (dwc2_process_non_isoc_desc(hsotg, chan, chnum, qtd,
                                                       desc_num, halt_status,
-                                                      &xfer_done))
+                                                      &xfer_done)) {
+                               qtd = NULL;
                                goto stop_scan;
+                       }
 
                        desc_num++;
                }
@@ -1261,7 +1263,7 @@ stop_scan:
                if (halt_status == DWC2_HC_XFER_STALL)
                        qh->data_toggle = DWC2_HC_PID_DATA0;
                else
-                       dwc2_hcd_save_data_toggle(hsotg, chan, chnum, qtd);
+                       dwc2_hcd_save_data_toggle(hsotg, chan, chnum, NULL);
        }
 
        if (halt_status == DWC2_HC_XFER_COMPLETE) {