diff options
author | Liam Girdwood | 2010-11-03 15:11:27 +0100 |
---|---|---|
committer | Liam Girdwood | 2010-11-03 15:11:27 +0100 |
commit | 8f987768eb99631374f4ab0bb19cd062baf1397d (patch) | |
tree | b89aa5c207f7ba6a688f45657424b937f17ceb8a /sound/soc/sh/siu_pcm.c | |
parent | ASoC: tpa6130a2: Fix unbalanced regulator disables (diff) | |
parent | Linux 2.6.37-rc1 (diff) | |
download | kernel-qcow2-linux-8f987768eb99631374f4ab0bb19cd062baf1397d.tar.gz kernel-qcow2-linux-8f987768eb99631374f4ab0bb19cd062baf1397d.tar.xz kernel-qcow2-linux-8f987768eb99631374f4ab0bb19cd062baf1397d.zip |
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'sound/soc/sh/siu_pcm.c')
-rw-r--r-- | sound/soc/sh/siu_pcm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index d6c79fa56d12..ed29c9e1ed4e 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c @@ -127,6 +127,7 @@ static int siu_pcm_wr_set(struct siu_port *port_info, sg_init_table(&sg, 1); sg_set_page(&sg, pfn_to_page(PFN_DOWN(buff)), size, offset_in_page(buff)); + sg_dma_len(&sg) = size; sg_dma_address(&sg) = buff; desc = siu_stream->chan->device->device_prep_slave_sg(siu_stream->chan, @@ -176,6 +177,7 @@ static int siu_pcm_rd_set(struct siu_port *port_info, sg_init_table(&sg, 1); sg_set_page(&sg, pfn_to_page(PFN_DOWN(buff)), size, offset_in_page(buff)); + sg_dma_len(&sg) = size; sg_dma_address(&sg) = buff; desc = siu_stream->chan->device->device_prep_slave_sg(siu_stream->chan, |