[ALSA] Fix PM support

Modules: ARM AACI PL041 driver,ARM PXA2XX driver

Fix PM support of aaci and pxa2xx drivers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 3 insertions, 9 deletions

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 691f6dd81c30..5e9a81ab990b 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -635,19 +635,14 @@ static struct snd_pcm_ops aaci_playback_ops = {
 static int aaci_do_suspend(struct snd_card *card, unsigned int state)
 {
         struct aaci *aaci = card->private_data;
-        if (aaci->card->power_state != SNDRV_CTL_POWER_D3cold) {
-                snd_pcm_suspend_all(aaci->pcm);
-                snd_power_change_state(aaci->card, SNDRV_CTL_POWER_D3cold);
-        }
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3cold);
+        snd_pcm_suspend_all(aaci->pcm);
         return 0;
 }
 
 static int aaci_do_resume(struct snd_card *card, unsigned int state)
 {
-        struct aaci *aaci = card->private_data;
-        if (aaci->card->power_state != SNDRV_CTL_POWER_D0) {
-                snd_power_change_state(aaci->card, SNDRV_CTL_POWER_D0);
-        }
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
         return 0;
 }
 
@@ -780,7 +775,6 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
                 return ERR_PTR(-ENOMEM);
 
         card->private_free = aaci_free_card;
-        snd_card_set_pm_callback(card, aaci_do_suspend, aaci_do_resume, NULL);
 
         strlcpy(card->driver, DRIVER_NAME, sizeof(card->driver));
         strlcpy(card->shortname, "ARM AC'97 Interface", sizeof(card->shortname));