Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-zesty-kernel.git] / drivers / dma / mxs-dma.c

diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index 1cb9b974493fd34b4e10895ee156de0aff1ff987..c96ab15319f245c363bf1ed693c5a61e0669fcef 100644 (file)
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -489,9 +489,9 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
                ccw->bits |= BF_CCW(MXS_DMA_CMD_NO_XFER, COMMAND);
        } else {
                for_each_sg(sgl, sg, sg_len, i) {
-                       if (sg->length > MAX_XFER_BYTES) {
+                       if (sg_dma_len(sg) > MAX_XFER_BYTES) {
                                dev_err(mxs_dma->dma_device.dev, "maximum bytes for sg entry exceeded: %d > %d\n",
-                                               sg->length, MAX_XFER_BYTES);
+                                               sg_dma_len(sg), MAX_XFER_BYTES);
                                goto err_out;
                        }
 
@@ -499,7 +499,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
 
                        ccw->next = mxs_chan->ccw_phys + sizeof(*ccw) * idx;
                        ccw->bufaddr = sg->dma_address;
-                       ccw->xfer_bytes = sg->length;
+                       ccw->xfer_bytes = sg_dma_len(sg);
 
                        ccw->bits = 0;
                        ccw->bits |= CCW_CHAIN;