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

Commit 869e9e56 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'for-greg' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb into usb-linus 

* 'for-greg' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb:
  usb: musb: gadget: clear TXPKTRDY flag when set FLUSHFIFO
  usb: musb: host: compare status for negative error values
parents 2c53b436 4858f06e

drivers/usb/musb/musb_gadget.c

+6 −0
Original line number Diff line number Diff line
@@ -1524,6 +1524,12 @@ static void musb_gadget_fifo_flush(struct usb_ep *ep) 
		csr = musb_readw(epio, MUSB_TXCSR);

		if (csr & MUSB_TXCSR_FIFONOTEMPTY) {

			csr |= MUSB_TXCSR_FLUSHFIFO | MUSB_TXCSR_P_WZC_BITS;

			/*

			 * Setting both TXPKTRDY and FLUSHFIFO makes controller

			 * to interrupt current FIFO loading, but not flushing

			 * the already loaded ones.

			 */

			csr &= ~MUSB_TXCSR_TXPKTRDY;

			musb_writew(epio, MUSB_TXCSR, csr);

			/* REVISIT may be inappropriate w/o FIFONOTEMPTY ... */

			musb_writew(epio, MUSB_TXCSR, csr);

drivers/usb/musb/musb_host.c

+1 −1
Original line number Diff line number Diff line
@@ -1575,7 +1575,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) 
			/* even if there was an error, we did the dma

			 * for iso_frame_desc->length

			 */

			if (d->status != EILSEQ && d->status != -EOVERFLOW)

			if (d->status != -EILSEQ && d->status != -EOVERFLOW)

				d->status = 0;



			if (++qh->iso_idx >= urb->number_of_packets)