From ddaa3001c4df2f700645f92b38fd1c9cae6f3362 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 14 Feb 2013 10:41:09 +0200 Subject: [PATCH] --- yaml --- r: 358555 b: refs/heads/master c: 877e86f28385407f05c5aa4e397d4ccb3233f01a h: refs/heads/master i: 358553: 8aaf2d563fecb6c0eced85807b09a175c367edae 358551: 2d7bd23b339be1371c1eb38727301ecd9df4f153 v: v3 --- [refs] | 2 +- trunk/drivers/dma/dw_dmac.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c9911e42bda9..8fced39ebf2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a20702b8d7c2b54a618e203d94b37b4f1d21bbd4 +refs/heads/master: 877e86f28385407f05c5aa4e397d4ccb3233f01a diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c index 6694676c9b82..4c83f18803f1 100644 --- a/trunk/drivers/dma/dw_dmac.c +++ b/trunk/drivers/dma/dw_dmac.c @@ -1661,6 +1661,12 @@ static int dw_probe(struct platform_device *pdev) if (!regs) return -EBUSY; + /* Apply default dma_mask if needed */ + if (!pdev->dev.dma_mask) { + pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; + pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); + } + dw_params = dma_read_byaddr(regs, DW_PARAMS); autocfg = dw_params >> DW_PARAMS_EN & 0x1;