diff options
author | Viresh Kumar <viresh.kumar@st.com> | 2011-08-10 04:50:55 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-09-21 11:41:47 -0400 |
commit | 538a18dc189ef5d0b87c987d8460515b5e2e8588 (patch) | |
tree | 51c5b16a938fee7e86f1448e09264dc80b7ffb63 /drivers/spi/spi-pl022.c | |
parent | f1e45f86ed93b9ec0b6b51dd75841894935d2b68 (diff) |
spi/spi-pl022: Use GFP_ATOMIC for allocation from tasklet
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>
Diffstat (limited to 'drivers/spi/spi-pl022.c')
-rw-r--r-- | drivers/spi/spi-pl022.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 6209540e06a6..01e9aa45ea88 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c | |||
@@ -1019,11 +1019,11 @@ static int configure_dma(struct pl022 *pl022) | |||
1019 | pages = (pl022->cur_transfer->len >> PAGE_SHIFT) + 1; | 1019 | pages = (pl022->cur_transfer->len >> PAGE_SHIFT) + 1; |
1020 | dev_dbg(&pl022->adev->dev, "using %d pages for transfer\n", pages); | 1020 | dev_dbg(&pl022->adev->dev, "using %d pages for transfer\n", pages); |
1021 | 1021 | ||
1022 | ret = sg_alloc_table(&pl022->sgt_rx, pages, GFP_KERNEL); | 1022 | ret = sg_alloc_table(&pl022->sgt_rx, pages, GFP_ATOMIC); |
1023 | if (ret) | 1023 | if (ret) |
1024 | goto err_alloc_rx_sg; | 1024 | goto err_alloc_rx_sg; |
1025 | 1025 | ||
1026 | ret = sg_alloc_table(&pl022->sgt_tx, pages, GFP_KERNEL); | 1026 | ret = sg_alloc_table(&pl022->sgt_tx, pages, GFP_ATOMIC); |
1027 | if (ret) | 1027 | if (ret) |
1028 | goto err_alloc_tx_sg; | 1028 | goto err_alloc_tx_sg; |
1029 | 1029 | ||