Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a20fa45 authored by Mian Yousaf Kaukab's avatar Mian Yousaf Kaukab Committed by Felipe Balbi
Browse files

usb: dwc2: gadget: rename sent_zlp to send_zlp 



This flag is set before sending the zlp. So use present tense instead
of the past tense.

Tested-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Acked-by: default avatarPaul Zimmerman <paulz@synopsys.com>
Signed-off-by: default avatarMian Yousaf Kaukab <yousaf.kaukab@intel.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 83d98223

drivers/usb/dwc2/core.h

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ struct s3c_hsotg_req; 
 * @halted: Set if the endpoint has been halted.

 * @periodic: Set if this is a periodic ep, such as Interrupt

 * @isochronous: Set if this is a isochronous ep

 * @sent_zlp: Set if we've sent a zero-length packet.

 * @send_zlp: Set if we need to send a zero-length packet.

 * @total_data: The total number of data bytes done.

 * @fifo_size: The size of the FIFO (for periodic IN endpoints)

 * @fifo_load: The amount of data loaded into the FIFO (periodic IN)
@@ -149,7 +149,7 @@ struct s3c_hsotg_ep { 
	unsigned int            halted:1;

	unsigned int            periodic:1;

	unsigned int            isochronous:1;

	unsigned int            sent_zlp:1;

	unsigned int            send_zlp:1;



	char                    name[10];

};

drivers/usb/dwc2/gadget.c

+4 −4
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg, 
		/* Test if zlp is actually required. */

		if ((ureq->length >= hs_ep->ep.maxpacket) &&

					!(ureq->length % hs_ep->ep.maxpacket))

			hs_ep->sent_zlp = 1;

			hs_ep->send_zlp = 1;

	}



	epsize |= DXEPTSIZ_PKTCNT(packets);
@@ -1193,7 +1193,7 @@ static void s3c_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg) 
	}



	hsotg->eps_out[0]->dir_in = 0;

	hsotg->eps_out[0]->sent_zlp = 0;

	hsotg->eps_out[0]->send_zlp = 0;

	hsotg->ep0_state = DWC2_EP0_SETUP;



	ret = s3c_hsotg_ep_queue(&hsotg->eps_out[0]->ep, req, GFP_ATOMIC);
@@ -1757,9 +1757,9 @@ static void s3c_hsotg_complete_in(struct dwc2_hsotg *hsotg, 
	}



	/* Zlp for all endpoints, for ep0 only in DATA IN stage */

	if (hs_ep->sent_zlp) {

	if (hs_ep->send_zlp) {

		s3c_hsotg_program_zlp(hsotg, hs_ep);

		hs_ep->sent_zlp = 0;

		hs_ep->send_zlp = 0;

		/* transfer will be completed on next complete interrupt */

		return;

	}