diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-23 18:39:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-23 18:39:47 +0200 |
| commit | cff7873554eedc044029c41a9fd694245d97eff8 (patch) | |
| tree | 453024605141ed884277e40d55f2b7e62b5b919c /sound/soc/sh/fsi.c | |
| parent | 5ac57550f279c3d991ef0b398681bcaca18169f7 (diff) | |
| parent | 1a38336b8611a04f0a624330c1f815421f4bf5f4 (diff) | |
| download | linux-stable-cff7873554eedc044029c41a9fd694245d97eff8.tar.gz linux-stable-cff7873554eedc044029c41a9fd694245d97eff8.tar.bz2 linux-stable-cff7873554eedc044029c41a9fd694245d97eff8.zip | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: updates for 3.4
Slightly larger than normal - the DAPM fix is a "this should always have
worked" type of thing which is very clear and should have no impact on
systems that don't need it. The WM8994 fix is driver specific but
pretty important for that driver.
Diffstat (limited to 'sound/soc/sh/fsi.c')
| -rw-r--r-- | sound/soc/sh/fsi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 378cc5b056d7..74ed2dffbffd 100644 --- a/sound/soc/sh/fsi.c +++ b/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; } |