summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCliff Cai <cliff.cai@analog.com>2009-07-14 10:01:40 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-14 19:44:52 +0100
commit82d76f4d9fbf7d951d63e7056fd9911ada507bd1 (patch)
tree4cfdaead4335fcbe5f3e8f0dab69d2875e5d6d3e
parent18d02bc32c0b35726b2a6a3699a0c44e5e8f6c94 (diff)
downloadop-kernel-dev-82d76f4d9fbf7d951d63e7056fd9911ada507bd1.zip
op-kernel-dev-82d76f4d9fbf7d951d63e7056fd9911ada507bd1.tar.gz
ASoC: Blackfin I2S: 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>
-rw-r--r--sound/soc/blackfin/bf5xx-i2s.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index af06904..876abad 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -259,22 +259,18 @@ static int bf5xx_i2s_resume(struct snd_soc_dai *dai)
if (!dai->active)
return 0;
- ret = sport_config_rx(sport_handle, RFSR | RCKFE, RSFSE|0x1f, 0, 0);
+ ret = sport_config_rx(sport, RFSR | RCKFE, RSFSE|0x1f, 0, 0);
if (ret) {
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- ret = sport_config_tx(sport_handle, TFSR | TCKFE, TSFSE|0x1f, 0, 0);
+ ret = sport_config_tx(sport, TFSR | TCKFE, TSFSE|0x1f, 0, 0);
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;
}
OpenPOWER on IntegriCloud