diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-21 08:10:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-21 08:10:14 +0100 |
| commit | 842a2097007b8a01a71a701300e970502a54bbb2 (patch) | |
| tree | 64f8ad8b41513fda0710cc6097968f11d0083ce5 /sound/soc/blackfin/bf5xx-ac97.c | |
| parent | 2f36f5e1ffcc18deee234b9085fabd2828f59ee0 (diff) | |
| parent | c88c2823e87dd6f8214b8b8cdc36d45f205a8077 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ac97.c')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ac97.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index c5f856ec27c..ffbac26b9bc 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c @@ -260,9 +260,9 @@ static int bf5xx_ac97_suspend(struct snd_soc_dai *dai) pr_debug("%s : sport %d\n", __func__, dai->id); if (!dai->active) return 0; - if (dai->capture.active) + if (dai->capture_active) sport_rx_stop(sport); - if (dai->playback.active) + if (dai->playback_active) sport_tx_stop(sport); return 0; } |