From 21bf9427cd29ffee7f3fe5dec944d777f646bbe1 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Sat, 3 Mar 2012 23:19:49 +0800 Subject: [PATCH] --- yaml --- r: 293444 b: refs/heads/master c: 9a3a101c1a34b498f466409ce5a1bf0fcbcc476b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/imx/imx-pcm-dma-mx2.c | 5 ----- trunk/sound/soc/imx/imx-ssi.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f85927f00585..ab6f16b64ec3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1defde2a50f9171e665cc8f4c46fe48e86bb364e +refs/heads/master: 9a3a101c1a34b498f466409ce5a1bf0fcbcc476b diff --git a/trunk/sound/soc/imx/imx-pcm-dma-mx2.c b/trunk/sound/soc/imx/imx-pcm-dma-mx2.c index 4cd5462049bc..471e2218c971 100644 --- a/trunk/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/trunk/sound/soc/imx/imx-pcm-dma-mx2.c @@ -149,11 +149,6 @@ static struct snd_soc_platform_driver imx_soc_platform_mx2 = { static int __devinit imx_soc_platform_probe(struct platform_device *pdev) { - struct imx_ssi *ssi = platform_get_drvdata(pdev); - - ssi->dma_params_tx.burstsize = 6; - ssi->dma_params_rx.burstsize = 4; - return snd_soc_register_platform(&pdev->dev, &imx_soc_platform_mx2); } diff --git a/trunk/sound/soc/imx/imx-ssi.c b/trunk/sound/soc/imx/imx-ssi.c index dbf43f5f0aed..25c623115a9f 100644 --- a/trunk/sound/soc/imx/imx-ssi.c +++ b/trunk/sound/soc/imx/imx-ssi.c @@ -668,7 +668,7 @@ static int imx_ssi_probe(struct platform_device *pdev) ssi->dma_params_rx.dma_addr = res->start + SSI_SRX0; ssi->dma_params_tx.dma_addr = res->start + SSI_STX0; - ssi->dma_params_tx.burstsize = 4; + ssi->dma_params_tx.burstsize = 6; ssi->dma_params_rx.burstsize = 4; res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx0");