edma3.patch

diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index fd039db..6d2a590 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -1556,7 +1556,7 @@ static int __init edma_probe(struct platform_device *pdev)
 	s16			(*rsv_slots)[2];
 	int			irq[EDMA_MAX_CC] = {0, 0};
 	int			err_irq[EDMA_MAX_CC] = {0, 0};
-	struct resource		*r[EDMA_MAX_CC] = {NULL};
+	struct resource		*r[EDMA_MAX_CC] = {NULL, NULL};
 	struct resource		res[EDMA_MAX_CC];
 	resource_size_t		len[EDMA_MAX_CC];
 	char			res_name[10];
@@ -1564,9 +1564,9 @@ static int __init edma_probe(struct platform_device *pdev)
 	struct device_node	*node = pdev->dev.of_node;
 	struct device		*dev = &pdev->dev;
 	struct edma_soc_info	*pdata;
+	int			ret;

 	if (node) {
-		int ret;
 		pdata = devm_kzalloc(dev,
 				     sizeof(struct edma_soc_info),
 				     GFP_KERNEL);
@@ -1588,23 +1588,22 @@ static int __init edma_probe(struct platform_device *pdev)
 		return -ENODEV;

 	for (j = 0; j < EDMA_MAX_CC; j++) {
+		if (!info[j]) {
+			if (!found)
+				return -ENODEV;
+			break;
+		}
 		if (node) {
-			int err;
-			err = of_address_to_resource(node, 0, &res[j]);
-			if (err) {
-				dev_err(dev,
-					"unable to find 'reg' property\n");
-				return -EIO;
-			}
-			r[j] = &res[j];
-
+			ret = of_address_to_resource(node, j, &res[j]);
+			if (!IS_ERR_VALUE(ret))
+				r[j] = &res[j];
 		} else {
 			sprintf(res_name, "edma_cc%d", j);
 			r[j] = platform_get_resource_byname(pdev,
 						IORESOURCE_MEM,
 						res_name);
 		}
-		if (!r[j] || !info[j]) {
+		if (!r[j]) {
 			if (found)
 				break;
 			else