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

Commit 679f9b7c authored by Ben Dooks's avatar Ben Dooks Committed by Greg Kroah-Hartman
Browse files

USB: s3c-hsotg: The NPTX/PTX FIFO sizes are in words, not bytes 



Fix a problem where we have been underestimating the space available in
the IN PTX/NPTX FIFOs by assuming that they where simply word aligned
instead of in number-of-words. This means all length calculations need
to be multiplied-by-4.

Note, we do not change the information about fifo size or start addresses
available to userspace as we assume the user can multiply by four easily
and is already knows these values are in words.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6d091ee7

drivers/usb/gadget/s3c-hsotg.c

+2 −1
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ static int s3c_hsotg_write_fifo(struct s3c_hsotg *hsotg, 
		}



		can_write = S3C_GNPTXSTS_NPTxFSpcAvail_GET(gnptxsts);

		can_write *= 4;	/* fifo size is in 32bit quantities. */

	}



	dev_dbg(hsotg->dev, "%s: GNPTXSTS=%08x, can=%d, to=%d, mps %d\n",
@@ -2732,7 +2733,7 @@ static void __devinit s3c_hsotg_initep(struct s3c_hsotg *hsotg, 
	 */



	ptxfifo = readl(hsotg->regs + S3C_DPTXFSIZn(epnum));

	hs_ep->fifo_size = S3C_DPTXFSIZn_DPTxFSize_GET(ptxfifo);

	hs_ep->fifo_size = S3C_DPTXFSIZn_DPTxFSize_GET(ptxfifo) * 4;



	/* if we're using dma, we need to set the next-endpoint pointer

	 * to be something valid.