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

Commit 51d9f3e1 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Greg Kroah-Hartman
Browse files

USB: musb: fix data toggle saving with shared FIFO 



For some strange reason the host side musb_giveback() decides
that it's always got an IN transfer when the hardware endpoint
is using a shared FIFO.  This causes musb_save_toggle() to read
the toggle state from the RXCSR register instead of TXCSR, and
may also cause unneeded reloading of RX endpoint registers.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dc61d238

drivers/usb/musb/musb_host.c

+1 −6
Original line number Diff line number Diff line
@@ -335,16 +335,11 @@ musb_save_toggle(struct musb_hw_ep *ep, int is_in, struct urb *urb) 
static struct musb_qh *

musb_giveback(struct musb_qh *qh, struct urb *urb, int status)

{

	int			is_in;

	struct musb_hw_ep	*ep = qh->hw_ep;

	struct musb		*musb = ep->musb;

	int			is_in = usb_pipein(urb->pipe);

	int			ready = qh->is_ready;



	if (ep->is_shared_fifo)

		is_in = 1;

	else

		is_in = usb_pipein(urb->pipe);



	/* save toggle eagerly, for paranoia */

	switch (qh->type) {

	case USB_ENDPOINT_XFER_BULK: