On Thu, Feb 14, 2013 at 10:41:09AM +0200, Andy Shevchenko wrote: > In some cases we got the device without dma_mask configured. We have to apply > the default value to avoid crashes during memory mapping. > > Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com> > Acked-by: Viresh Kumar <viresh.ku...@linaro.org> Applied, thanks
> --- > Since v1: > - rebased on top of recent next branch from Vinod > drivers/dma/dw_dmac.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c > index 6694676..4c83f18 100644 > --- a/drivers/dma/dw_dmac.c > +++ b/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; > > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/