Merge branch 'ioat' into dmaengine

1 files changed, 3 insertions, 1 deletions

diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 6362ca05506e..adadcd3aa1b1 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/clk.h>
@@ -585,7 +586,8 @@ static int davinci_i2s_probe(struct platform_device *pdev)
         dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res->start;
 
         davinci_i2s_dai.private_data = dev;
-        davinci_i2s_dai.dma_data = dev->dma_params;
+        davinci_i2s_dai.capture.dma_data = dev->dma_params;
+        davinci_i2s_dai.playback.dma_data = dev->dma_params;
         ret = snd_soc_register_dai(&davinci_i2s_dai);
         if (ret != 0)
                 goto err_free_mem;