diff options
author | Cliff Cai <cliff.cai@analog.com> | 2009-07-14 10:01:39 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-14 14:44:52 -0400 |
commit | 18d02bc32c0b35726b2a6a3699a0c44e5e8f6c94 (patch) | |
tree | 7c6710648eb20008c97ae6ef5380a41bbbca0f08 /sound/soc/blackfin | |
parent | ba3b64b976f91067710ef1a87b9b445406910e8f (diff) |
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.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index b1ed423fabd5..2758b9017a7f 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) | |||
277 | if (!dai->active) | 277 | if (!dai->active) |
278 | return 0; | 278 | return 0; |
279 | 279 | ||
280 | ret = sport_set_multichannel(sport_handle, 16, 0x1F, 1); | 280 | ret = sport_set_multichannel(sport, 16, 0x1F, 1); |
281 | if (ret) { | 281 | if (ret) { |
282 | pr_err("SPORT is busy!\n"); | 282 | pr_err("SPORT is busy!\n"); |
283 | return -EBUSY; | 283 | return -EBUSY; |
284 | } | 284 | } |
285 | 285 | ||
286 | ret = sport_config_rx(sport_handle, IRFS, 0xF, 0, (16*16-1)); | 286 | ret = sport_config_rx(sport, IRFS, 0xF, 0, (16*16-1)); |
287 | if (ret) { | 287 | if (ret) { |
288 | pr_err("SPORT is busy!\n"); | 288 | pr_err("SPORT is busy!\n"); |
289 | return -EBUSY; | 289 | return -EBUSY; |
290 | } | 290 | } |
291 | 291 | ||
292 | ret = sport_config_tx(sport_handle, ITFS, 0xF, 0, (16*16-1)); | 292 | ret = sport_config_tx(sport, ITFS, 0xF, 0, (16*16-1)); |
293 | if (ret) { | 293 | if (ret) { |
294 | pr_err("SPORT is busy!\n"); | 294 | pr_err("SPORT is busy!\n"); |
295 | return -EBUSY; | 295 | return -EBUSY; |
296 | } | 296 | } |
297 | 297 | ||
298 | if (dai->capture.active) | ||
299 | sport_rx_start(sport); | ||
300 | if (dai->playback.active) | ||
301 | sport_tx_start(sport); | ||
302 | return 0; | 298 | return 0; |
303 | } | 299 | } |
304 | 300 | ||