diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /sound/soc/blackfin/bf5xx-ac97.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
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 c0eba5109980..d91f2e44e7e6 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) | |||
| 260 | pr_debug("%s : sport %d\n", __func__, dai->id); | 260 | pr_debug("%s : sport %d\n", __func__, dai->id); |
| 261 | if (!dai->active) | 261 | if (!dai->active) |
| 262 | return 0; | 262 | return 0; |
| 263 | if (dai->capture.active) | 263 | if (dai->capture_active) |
| 264 | sport_rx_stop(sport); | 264 | sport_rx_stop(sport); |
| 265 | if (dai->playback.active) | 265 | if (dai->playback_active) |
| 266 | sport_tx_stop(sport); | 266 | sport_tx_stop(sport); |
| 267 | return 0; | 267 | return 0; |
| 268 | } | 268 | } |