From 4ebcf44ba8606b3e2d267cecd7b396b846cf06b0 Mon Sep 17 00:00:00 2001 From: Linqiang Pu Date: Wed, 2 May 2012 21:37:27 +0800 Subject: dmaengine/dma_slave: fix merge issue. Change-Id: I0931f4ef7a5464dd32d8c703288a137fc77857ce Signed-off-by: Linqiang Pu Reviewed-on: http://git-master/r/100090 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan --- sound/soc/sh/siu_pcm.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'sound') diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index de9abd032fd4..5cfcc655e95f 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c @@ -180,13 +180,8 @@ static int siu_pcm_rd_set(struct siu_port *port_info, sg_dma_len(&sg) = size; sg_dma_address(&sg) = buff; -<<<<<<< HEAD - desc = siu_stream->chan->device->device_prep_slave_sg(siu_stream->chan, - &sg, 1, DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); -======= desc = dmaengine_prep_slave_sg(siu_stream->chan, &sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); ->>>>>>> 1605282... dmaengine/dma_slave: introduce inline wrappers if (!desc) { dev_err(dev, "Failed to allocate dma descriptor\n"); return -ENOMEM; -- cgit v1.2.3