diff options
author | Cliff Cai <cliff.cai@analog.com> | 2009-07-14 10:01:40 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-14 14:44:52 -0400 |
commit | 82d76f4d9fbf7d951d63e7056fd9911ada507bd1 (patch) | |
tree | 4cfdaead4335fcbe5f3e8f0dab69d2875e5d6d3e /sound/soc/blackfin | |
parent | 18d02bc32c0b35726b2a6a3699a0c44e5e8f6c94 (diff) |
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>
Diffstat (limited to 'sound/soc/blackfin')
-rw-r--r-- | sound/soc/blackfin/bf5xx-i2s.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c index af06904bab0f..876abade27e1 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) | |||
259 | if (!dai->active) | 259 | if (!dai->active) |
260 | return 0; | 260 | return 0; |
261 | 261 | ||
262 | ret = sport_config_rx(sport_handle, RFSR | RCKFE, RSFSE|0x1f, 0, 0); | 262 | ret = sport_config_rx(sport, RFSR | RCKFE, RSFSE|0x1f, 0, 0); |
263 | if (ret) { | 263 | if (ret) { |
264 | pr_err("SPORT is busy!\n"); | 264 | pr_err("SPORT is busy!\n"); |
265 | return -EBUSY; | 265 | return -EBUSY; |
266 | } | 266 | } |
267 | 267 | ||
268 | ret = sport_config_tx(sport_handle, TFSR | TCKFE, TSFSE|0x1f, 0, 0); | 268 | ret = sport_config_tx(sport, TFSR | TCKFE, TSFSE|0x1f, 0, 0); |
269 | if (ret) { | 269 | if (ret) { |
270 | pr_err("SPORT is busy!\n"); | 270 | pr_err("SPORT is busy!\n"); |
271 | return -EBUSY; | 271 | return -EBUSY; |
272 | } | 272 | } |
273 | 273 | ||
274 | if (dai->capture.active) | ||
275 | sport_rx_start(sport); | ||
276 | if (dai->playback.active) | ||
277 | sport_tx_start(sport); | ||
278 | return 0; | 274 | return 0; |
279 | } | 275 | } |
280 | 276 | ||