X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=drivers%2Fdma%2Fmcf-edma-main.c;fp=drivers%2Fdma%2Fmcf-edma-main.c;h=b359421ee9ea52e2a31e786a6c0d59f4551be5b3;hb=708283abf896dd4853e673cc8cba70acaf9bf4ea;hp=a903461da5bd57b3bfab61ec4a91f2a3d98ff2b0;hpb=72f5801a4e2b7122ed8ff5672ea965a0b3458e6b;p=platform%2Fkernel%2Flinux-rpi.git

diff --git a/drivers/dma/mcf-edma-main.c b/drivers/dma/mcf-edma-main.c
index a903461..b359421 100644
--- a/drivers/dma/mcf-edma-main.c
+++ b/drivers/dma/mcf-edma-main.c
@@ -163,7 +163,13 @@ static int mcf_edma_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	chans = pdata->dma_channels;
+	if (!pdata->dma_channels) {
+		dev_info(&pdev->dev, "setting default channel number to 64");
+		chans = 64;
+	} else {
+		chans = pdata->dma_channels;
+	}
+
 	mcf_edma = devm_kzalloc(&pdev->dev, struct_size(mcf_edma, chans, chans),
 				GFP_KERNEL);
 	if (!mcf_edma)
@@ -175,11 +181,6 @@ static int mcf_edma_probe(struct platform_device *pdev)
 	mcf_edma->drvdata = &mcf_data;
 	mcf_edma->big_endian = 1;
 
-	if (!mcf_edma->n_chans) {
-		dev_info(&pdev->dev, "setting default channel number to 64");
-		mcf_edma->n_chans = 64;
-	}
-
 	mutex_init(&mcf_edma->fsl_edma_mutex);
 
 	mcf_edma->membase = devm_platform_ioremap_resource(pdev, 0);