dmaengine: ti: omap-dma: Annotate struct omap_desc with __counted_by

[linux-2.6-microblaze.git] / drivers / dma / ti / omap-dma.c

diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index 76db0fc..b9e0e22 100644 (file)
--- a/drivers/dma/ti/omap-dma.c
+++ b/drivers/dma/ti/omap-dma.c
@@ -124,7 +124,7 @@ struct omap_desc {
        uint32_t csdp;          /* CSDP value */
 
        unsigned sglen;
-       struct omap_sg sg[];
+       struct omap_sg sg[] __counted_by(sglen);
 };
 
 enum {
@@ -1005,6 +1005,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_slave_sg(
        d = kzalloc(struct_size(d, sg, sglen), GFP_ATOMIC);
        if (!d)
                return NULL;
+       d->sglen = sglen;
 
        d->dir = dir;
        d->dev_addr = dev_addr;
@@ -1120,8 +1121,6 @@ static struct dma_async_tx_descriptor *omap_dma_prep_slave_sg(
                }
        }
 
-       d->sglen = sglen;
-
        /* Release the dma_pool entries if one allocation failed */
        if (ll_failed) {
                for (i = 0; i < d->sglen; i++) {