From 9f94f5f096ac07a96e86cd222d14a97a3f4a35b9 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 23 Feb 2009 18:45:19 +0000 Subject: [PATCH] --- yaml --- r: 132860 b: refs/heads/master c: d3b894218441ecb1c83e47c682e2d6589ee37a8d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/pxa/zylonite.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4a61e6599b1a..243cbf855ae2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8056d9bbb57207854462b6b0a3a75d172300cce5 +refs/heads/master: d3b894218441ecb1c83e47c682e2d6589ee37a8d diff --git a/trunk/sound/soc/pxa/zylonite.c b/trunk/sound/soc/pxa/zylonite.c index ec2fb764b241..0140a250db24 100644 --- a/trunk/sound/soc/pxa/zylonite.c +++ b/trunk/sound/soc/pxa/zylonite.c @@ -127,9 +127,8 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream, if (ret < 0) return ret; - ret = snd_soc_dai_set_tdm_slot(cpu_dai, - params_channels(params), - params_channels(params)); + /* We're not really in network mode but the emulation wants this. */ + ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 1); if (ret < 0) return ret;