Merge tag 'usb-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[sfrench/cifs-2.6.git] / drivers / usb / cdns3 / cdnsp-ring.c

diff --git a/drivers/usb/cdns3/cdnsp-ring.c b/drivers/usb/cdns3/cdnsp-ring.c
index 794e413800ae8239ac8ce2d92de8ddb8c6620345..2f29431f612e04f7a755fc6f2e32b9b8f01b4730 100644 (file)
--- a/drivers/usb/cdns3/cdnsp-ring.c
+++ b/drivers/usb/cdns3/cdnsp-ring.c
@@ -1763,10 +1763,15 @@ static u32 cdnsp_td_remainder(struct cdnsp_device *pdev,
                              int trb_buff_len,
                              unsigned int td_total_len,
                              struct cdnsp_request *preq,
-                             bool more_trbs_coming)
+                             bool more_trbs_coming,
+                             bool zlp)
 {
        u32 maxp, total_packet_count;
 
+       /* Before ZLP driver needs set TD_SIZE = 1. */
+       if (zlp)
+               return 1;
+
        /* One TRB with a zero-length data packet. */
        if (!more_trbs_coming || (transferred == 0 && trb_buff_len == 0) ||
            trb_buff_len == td_total_len)
@@ -1960,7 +1965,8 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq)
                /* Set the TRB length, TD size, and interrupter fields. */
                remainder = cdnsp_td_remainder(pdev, enqd_len, trb_buff_len,
                                               full_len, preq,
-                                              more_trbs_coming);
+                                              more_trbs_coming,
+                                              zero_len_trb);
 
                length_field = TRB_LEN(trb_buff_len) | TRB_TD_SIZE(remainder) |
                        TRB_INTR_TARGET(0);
@@ -2025,7 +2031,7 @@ int cdnsp_queue_ctrl_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq)
 
        if (preq->request.length > 0) {
                remainder = cdnsp_td_remainder(pdev, 0, preq->request.length,
-                                              preq->request.length, preq, 1);
+                                              preq->request.length, preq, 1, 0);
 
                length_field = TRB_LEN(preq->request.length) |
                                TRB_TD_SIZE(remainder) | TRB_INTR_TARGET(0);
@@ -2076,7 +2082,8 @@ int cdnsp_cmd_stop_ep(struct cdnsp_device *pdev, struct cdnsp_ep *pep)
        u32 ep_state = GET_EP_CTX_STATE(pep->out_ctx);
        int ret = 0;
 
-       if (ep_state == EP_STATE_STOPPED || ep_state == EP_STATE_DISABLED) {
+       if (ep_state == EP_STATE_STOPPED || ep_state == EP_STATE_DISABLED ||
+           ep_state == EP_STATE_HALTED) {
                trace_cdnsp_ep_stopped_or_disabled(pep->out_ctx);
                goto ep_stopped;
        }
@@ -2225,7 +2232,7 @@ static int cdnsp_queue_isoc_tx(struct cdnsp_device *pdev,
                /* Set the TRB length, TD size, & interrupter fields. */
                remainder = cdnsp_td_remainder(pdev, running_total,
                                               trb_buff_len, td_len, preq,
-                                              more_trbs_coming);
+                                              more_trbs_coming, 0);
 
                length_field = TRB_LEN(trb_buff_len) | TRB_INTR_TARGET(0);