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

Commit b181565e authored by Viresh Kumar's avatar Viresh Kumar Committed by Grant Likely
Browse files

spi/spi-pl022: Don't allocate more sg than required. 



In routine configure_dma(), if transfer->len = PAGE_SIZE, then pages is one more
than required. While leads to one more sg getting allocated.

This is wrong. Correct this to allocate correct number of sg.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 538a18dc

drivers/spi/spi-pl022.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1016,7 +1016,7 @@ static int configure_dma(struct pl022 *pl022) 
	dmaengine_slave_config(txchan, &tx_conf);

	dmaengine_slave_config(txchan, &tx_conf);





	/* Create sglists for the transfers */

	/* Create sglists for the transfers */

	pages = (pl022->cur_transfer->len >> PAGE_SHIFT) + 1;

	pages = DIV_ROUND_UP(pl022->cur_transfer->len, PAGE_SIZE);

	dev_dbg(&pl022->adev->dev, "using %d pages for transfer\n", pages);

	dev_dbg(&pl022->adev->dev, "using %d pages for transfer\n", pages);





	ret = sg_alloc_table(&pl022->sgt_rx, pages, GFP_ATOMIC);

	ret = sg_alloc_table(&pl022->sgt_rx, pages, GFP_ATOMIC);