Merge branch 'rework/kthreads' into for-linus

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

diff --git a/drivers/dma/ti/cppi41.c b/drivers/dma/ti/cppi41.c
index 062bd9b..695915d 100644 (file)
--- a/drivers/dma/ti/cppi41.c
+++ b/drivers/dma/ti/cppi41.c
@@ -1105,8 +1105,12 @@ static int cppi41_dma_probe(struct platform_device *pdev)
        cdd->qmgr_num_pend = glue_info->qmgr_num_pend;
        cdd->first_completion_queue = glue_info->first_completion_queue;
 
+       /* Parse new and deprecated dma-channels properties */
        ret = of_property_read_u32(dev->of_node,
-                                  "#dma-channels", &cdd->n_chans);
+                                  "dma-channels", &cdd->n_chans);
+       if (ret)
+               ret = of_property_read_u32(dev->of_node,
+                                          "#dma-channels", &cdd->n_chans);
        if (ret)
                goto err_get_n_chans;