3 files changed, 5 insertions, 4 deletions

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index fcb9a916e6f6..0469d8eda253 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -1562,7 +1562,8 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
                 }
         } else {
                 dw->nr_masters = pdata->nr_masters;
-                memcpy(dw->data_width, pdata->data_width, 4);
+                for (i = 0; i < dw->nr_masters; i++)
+                        dw->data_width[i] = pdata->data_width[i];
         }
 
         /* Calculate all channel mask before DMA setup */
diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index a630161473a4..aaff37f53523 100644
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -99,7 +99,7 @@ dw_dma_parse_dt(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
         struct dw_dma_platform_data *pdata;
-        u32 tmp, arr[4];
+        u32 tmp, arr[DW_DMA_MAX_NR_MASTERS];
 
         if (!np) {
                 dev_err(&pdev->dev, "Missing DT data\n");
@@ -126,7 +126,7 @@ dw_dma_parse_dt(struct platform_device *pdev)
                 pdata->block_size = tmp;
 
         if (!of_property_read_u32(np, "dma-masters", &tmp)) {
-                if (tmp > 4)
+                if (tmp > DW_DMA_MAX_NR_MASTERS)
                         return NULL;
 
                 pdata->nr_masters = tmp;
diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index 254a1db03680..241ff2b1402b 100644
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -285,7 +285,7 @@ struct dw_dma {
 
         /* hardware configuration */
         unsigned char           nr_masters;
-        unsigned char           data_width[4];
+        unsigned char           data_width[DW_DMA_MAX_NR_MASTERS];
 };
 
 static inline struct dw_dma_regs __iomem *__dw_regs(struct dw_dma *dw)