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

Commit 08f0d966 authored by Pratyush Anand's avatar Pratyush Anand Committed by Felipe Balbi
Browse files

usb: dwc3: correct set_halt implementation for ep0 



set_halt for ep0 is called to stall a deferred control responses by the
gadget.  We already have a function to stall default control endpoint.
This patch points set_halt for ep0 to the already available function.

Signed-off-by: default avatarPratyush Anand <pratyush.anand@st.com>
Signed-off-by: default avatarMichel Sanches <michel.sanches@st.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 5c81abab

drivers/usb/dwc3/ep0.c

+10 −0
Original line number Diff line number Diff line
@@ -225,6 +225,16 @@ static void dwc3_ep0_stall_and_restart(struct dwc3 *dwc) 
	dwc3_ep0_out_start(dwc);

}



int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)

{

	struct dwc3_ep			*dep = to_dwc3_ep(ep);

	struct dwc3			*dwc = dep->dwc;



	dwc3_ep0_stall_and_restart(dwc);



	return 0;

}



void dwc3_ep0_out_start(struct dwc3 *dwc)

{

	int				ret;

drivers/usb/dwc3/gadget.c

+5 −2
Original line number Diff line number Diff line
@@ -1268,6 +1268,9 @@ static int dwc3_gadget_ep_set_wedge(struct usb_ep *ep) 
	dep->flags |= DWC3_EP_WEDGE;

	spin_unlock_irqrestore(&dwc->lock, flags);



	if (dep->number == 0 || dep->number == 1)

		return dwc3_gadget_ep0_set_halt(ep, 1);

	else

		return dwc3_gadget_ep_set_halt(ep, 1);

}
@@ -1286,7 +1289,7 @@ static const struct usb_ep_ops dwc3_gadget_ep0_ops = { 
	.free_request	= dwc3_gadget_ep_free_request,

	.queue		= dwc3_gadget_ep0_queue,

	.dequeue	= dwc3_gadget_ep_dequeue,

	.set_halt	= dwc3_gadget_ep_set_halt,

	.set_halt	= dwc3_gadget_ep0_set_halt,

	.set_wedge	= dwc3_gadget_ep_set_wedge,

};

drivers/usb/dwc3/gadget.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state); 
void dwc3_ep0_interrupt(struct dwc3 *dwc,

		const struct dwc3_event_depevt *event);

void dwc3_ep0_out_start(struct dwc3 *dwc);

int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value);

int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,

		gfp_t gfp_flags);

int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value);