aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin
diff options
context:
space:
mode:
authorCliff Cai <cliff.cai@analog.com>2009-07-14 10:01:39 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-14 19:44:52 +0100
commit18d02bc32c0b35726b2a6a3699a0c44e5e8f6c94 (patch)
tree7c6710648eb20008c97ae6ef5380a41bbbca0f08 /sound/soc/blackfin
parentba3b64b976f91067710ef1a87b9b445406910e8f (diff)
downloadkernel_samsung_tuna-18d02bc32c0b35726b2a6a3699a0c44e5e8f6c94.zip
kernel_samsung_tuna-18d02bc32c0b35726b2a6a3699a0c44e5e8f6c94.tar.gz
kernel_samsung_tuna-18d02bc32c0b35726b2a6a3699a0c44e5e8f6c94.tar.bz2
ASoC: Blackfin AC97: fix resume handling
There is no need to manually start playback/capture ourselves as the PCM driver will handle things for us. Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/blackfin')
-rw-r--r--sound/soc/blackfin/bf5xx-ac97.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index b1ed423..2758b90 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -277,28 +277,24 @@ static int bf5xx_ac97_resume(struct snd_soc_dai *dai)
if (!dai->active)
return 0;
- ret = sport_set_multichannel(sport_handle, 16, 0x1F, 1);
+ ret = sport_set_multichannel(sport, 16, 0x1F, 1);
if (ret) {
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- ret = sport_config_rx(sport_handle, IRFS, 0xF, 0, (16*16-1));
+ ret = sport_config_rx(sport, IRFS, 0xF, 0, (16*16-1));
if (ret) {
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- ret = sport_config_tx(sport_handle, ITFS, 0xF, 0, (16*16-1));
+ ret = sport_config_tx(sport, ITFS, 0xF, 0, (16*16-1));
if (ret) {
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- if (dai->capture.active)
- sport_rx_start(sport);
- if (dai->playback.active)
- sport_tx_start(sport);
return 0;
}