diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-28 13:38:53 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-28 13:38:53 +1000 |
| commit | 4542437679de448de0f75bc901dab380d6a5bc5b (patch) | |
| tree | 1a436c9b6f9459c3938e2bb1ab7ad2c888d0003c /sound/core/init.c | |
| parent | 2227718ca2f7d5fcc2741c1bbca4d0c2efd340ce (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
Merge in v2.6.14 by hand
Diffstat (limited to 'sound/core/init.c')
| -rw-r--r-- | sound/core/init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index a5702014a70..c72a79115cc 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; } |