diff options
| -rw-r--r-- | drivers/dma/tegra20-apb-dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index d4cabd6931e5..754c1f54d4fe 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c | |||
| @@ -296,7 +296,7 @@ static struct tegra_dma_desc *tegra_dma_desc_get( | |||
| 296 | spin_unlock_irqrestore(&tdc->lock, flags); | 296 | spin_unlock_irqrestore(&tdc->lock, flags); |
| 297 | 297 | ||
| 298 | /* Allocate DMA desc */ | 298 | /* Allocate DMA desc */ |
| 299 | dma_desc = kzalloc(sizeof(*dma_desc), GFP_ATOMIC); | 299 | dma_desc = kzalloc(sizeof(*dma_desc), GFP_NOWAIT); |
| 300 | if (!dma_desc) { | 300 | if (!dma_desc) { |
| 301 | dev_err(tdc2dev(tdc), "dma_desc alloc failed\n"); | 301 | dev_err(tdc2dev(tdc), "dma_desc alloc failed\n"); |
| 302 | return NULL; | 302 | return NULL; |
| @@ -336,7 +336,7 @@ static struct tegra_dma_sg_req *tegra_dma_sg_req_get( | |||
| 336 | } | 336 | } |
| 337 | spin_unlock_irqrestore(&tdc->lock, flags); | 337 | spin_unlock_irqrestore(&tdc->lock, flags); |
| 338 | 338 | ||
| 339 | sg_req = kzalloc(sizeof(struct tegra_dma_sg_req), GFP_ATOMIC); | 339 | sg_req = kzalloc(sizeof(struct tegra_dma_sg_req), GFP_NOWAIT); |
| 340 | if (!sg_req) | 340 | if (!sg_req) |
| 341 | dev_err(tdc2dev(tdc), "sg_req alloc failed\n"); | 341 | dev_err(tdc2dev(tdc), "sg_req alloc failed\n"); |
| 342 | return sg_req; | 342 | return sg_req; |
