spi/spi-pl022: Don't allocate more sg than required.
authorViresh Kumar <viresh.kumar@st.com>
Wed, 10 Aug 2011 11:42:11 +0000 (17:12 +0530)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 21 Sep 2011 15:41:47 +0000 (09:41 -0600)
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: Viresh Kumar <viresh.kumar@st.com>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
drivers/spi/spi-pl022.c

index 01e9aa45ea88ba91a35fb84679da1d39e87de8c7..248674c8a8c2d6b966698c67db271952fdc061ce 100644 (file)
@@ -1016,7 +1016,7 @@ static int configure_dma(struct pl022 *pl022)
        dmaengine_slave_config(txchan, &tx_conf);
 
        /* 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);
 
        ret = sg_alloc_table(&pl022->sgt_rx, pages, GFP_ATOMIC);