spi/spi-pl022: Use GFP_ATOMIC for allocation from tasklet
authorViresh Kumar <viresh.kumar@st.com>
Wed, 10 Aug 2011 08:50:55 +0000 (14:20 +0530)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 21 Sep 2011 15:41:47 +0000 (09:41 -0600)
tasklets don't allow invocation to sleeping routines. In configure_dma()
routine, sg_alloc_table() was called with GFP_KERNEL flag and so this causes
crash when called from tasklet.

Replace GFP_KERNEL with GFP_ATOMIC to get this fixed.

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 6209540e06a63e35c9991bbfe18e363c355259e9..01e9aa45ea88ba91a35fb84679da1d39e87de8c7 100644 (file)
@@ -1019,11 +1019,11 @@ static int configure_dma(struct pl022 *pl022)
        pages = (pl022->cur_transfer->len >> PAGE_SHIFT) + 1;
        dev_dbg(&pl022->adev->dev, "using %d pages for transfer\n", pages);
 
-       ret = sg_alloc_table(&pl022->sgt_rx, pages, GFP_KERNEL);
+       ret = sg_alloc_table(&pl022->sgt_rx, pages, GFP_ATOMIC);
        if (ret)
                goto err_alloc_rx_sg;
 
-       ret = sg_alloc_table(&pl022->sgt_tx, pages, GFP_KERNEL);
+       ret = sg_alloc_table(&pl022->sgt_tx, pages, GFP_ATOMIC);
        if (ret)
                goto err_alloc_tx_sg;