From d65748ea81d7847b7eedce84c2d8e4e5852a8a1f Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 17 Apr 2012 19:13:04 -0700 Subject: [PATCH] --- yaml --- r: 299675 b: refs/heads/master c: cdf27f373781d8740b874b0b5c18142df32ebb52 h: refs/heads/master i: 299673: 091a35a05a6cb70bed7c7f8718bb7a5437c53f9a 299671: 385986eace892495ce5685f8c0a85baf71fa169a v: v3 --- [refs] | 2 +- trunk/sound/soc/sh/fsi.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f374f9eae8c1..98d1153490df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7dbb603423d499acacefb5fad65d2b406f16370 +refs/heads/master: cdf27f373781d8740b874b0b5c18142df32ebb52 diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c index 378cc5b056d7..74ed2dffbffd 100644 --- a/trunk/sound/soc/sh/fsi.c +++ b/trunk/sound/soc/sh/fsi.c @@ -1001,11 +1001,10 @@ static void fsi_dma_do_tasklet(unsigned long data) sg_dma_address(&sg) = buf; sg_dma_len(&sg) = len; - desc = chan->device->device_prep_slave_sg(chan, &sg, 1, dir, - DMA_PREP_INTERRUPT | - DMA_CTRL_ACK); + desc = dmaengine_prep_slave_sg(chan, &sg, 1, dir, + DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc) { - dev_err(dai->dev, "device_prep_slave_sg() fail\n"); + dev_err(dai->dev, "dmaengine_prep_slave_sg() fail\n"); return; }