From ff4118bcdfb5598cc6473ca83faffd47bf5a7273 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Wed, 10 Aug 2011 14:20:55 +0530 Subject: [PATCH] --- yaml --- r: 271169 b: refs/heads/master c: 538a18dc189ef5d0b87c987d8460515b5e2e8588 h: refs/heads/master i: 271167: 86881ae4d7646d35aaae13919c57676dbdcb3643 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-pl022.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9beb4aa1c242..c17ded7152b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1e45f86ed93b9ec0b6b51dd75841894935d2b68 +refs/heads/master: 538a18dc189ef5d0b87c987d8460515b5e2e8588 diff --git a/trunk/drivers/spi/spi-pl022.c b/trunk/drivers/spi/spi-pl022.c index 6209540e06a6..01e9aa45ea88 100644 --- a/trunk/drivers/spi/spi-pl022.c +++ b/trunk/drivers/spi/spi-pl022.c @@ -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;