summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2005-10-26 23:28:40 -0400
committerKyle McMartin <kyle@parisc-linux.org>2005-10-26 23:28:40 -0400
commite0f998930eb67c49f2862c58a45262ad0bc03eca (patch)
treed2bc6cbe11a00a05f96da01b1d4ac27adaabd546 /sound
parent6958ae318bb1af5e0b77968384700fb184fb8893 (diff)
parent7a4ed937aa44acdeb8c6ba671509dc7b54b09d3a (diff)
Auto-update from upstream
Diffstat (limited to 'sound')
-rw-r--r--sound/core/init.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/core/init.c b/sound/core/init.c
index a5702014a704..c72a79115cca 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -828,7 +828,8 @@ static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level
card = get_snd_generic_card(dev);
if (card->power_state == SNDRV_CTL_POWER_D3hot)
return 0;
- card->pm_suspend(card, PMSG_SUSPEND);
+ if (card->pm_suspend)
+ card->pm_suspend(card, PMSG_SUSPEND);
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
return 0;
}
@@ -843,7 +844,8 @@ static int snd_generic_resume(struct device *dev, u32 level)
card = get_snd_generic_card(dev);
if (card->power_state == SNDRV_CTL_POWER_D0)
return 0;
- card->pm_resume(card);
+ if (card->pm_suspend)
+ card->pm_resume(card);
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0;
}