diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-11-02 09:18:55 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-11-02 09:18:55 +0000 |
| commit | 92f6b848638aa58bf407d4d2fabedf75c5bb31aa (patch) | |
| tree | c6156346cb8a4a4c042b4e74af8e409d76b0355f | |
| parent | 01f62b15394d814bdcd690942198e45246d3e622 (diff) | |
| parent | 11b065b501efc1d1cf328cee4411436b83c5317b (diff) | |
Merge branch 'lsk-3.18-armlt-dma' into integration-lsk-3.18-armlt-android
| -rw-r--r-- | drivers/dma/pl330.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 19a99743cf52..52c4c620c426 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2619,6 +2619,9 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) return -ENOMEM; } + pd = &pl330->ddma; + pd->dev = &adev->dev; + pl330->mcbufsz = pdat ? pdat->mcbuf_sz : 0; res = &adev->res; @@ -2655,7 +2658,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) if (!add_desc(pl330, GFP_KERNEL, NR_DEFAULT_DESC)) dev_warn(&adev->dev, "unable to allocate desc\n"); - pd = &pl330->ddma; INIT_LIST_HEAD(&pd->channels); /* Initialize channel parameters */ @@ -2692,7 +2694,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) list_add_tail(&pch->chan.device_node, &pd->channels); } - pd->dev = &adev->dev; if (pdat) { pd->cap_mask = pdat->cap_mask; } else { |