summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-18 08:04:36 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-18 08:04:36 +0100
commitf1aa2986795387ff785d1c13ad9cb9159b202e87 (patch)
tree6e4dfbbeaaea06d3e9edd6b5ab1c5cfa20e5a2ab /sound
parenta232ee66e015da806936dc410684f5639035f066 (diff)
parentdde332b660cf0bc2baaba678b52768a0fb6e6da2 (diff)
downloadlinux-3.10-f1aa2986795387ff785d1c13ad9cb9159b202e87.tar.gz
linux-3.10-f1aa2986795387ff785d1c13ad9cb9159b202e87.tar.bz2
linux-3.10-f1aa2986795387ff785d1c13ad9cb9159b202e87.zip
Merge branch 'fix/opl3sa2-suspend' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/opl3sa2.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 58c972b2af0..b848d100186 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -550,21 +550,27 @@ static int __devinit snd_opl3sa2_mixer(struct snd_card *card)
#ifdef CONFIG_PM
static int snd_opl3sa2_suspend(struct snd_card *card, pm_message_t state)
{
- struct snd_opl3sa2 *chip = card->private_data;
+ if (card) {
+ struct snd_opl3sa2 *chip = card->private_data;
- snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
- chip->wss->suspend(chip->wss);
- /* power down */
- snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
+ snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+ chip->wss->suspend(chip->wss);
+ /* power down */
+ snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
+ }
return 0;
}
static int snd_opl3sa2_resume(struct snd_card *card)
{
- struct snd_opl3sa2 *chip = card->private_data;
+ struct snd_opl3sa2 *chip;
int i;
+ if (!card)
+ return 0;
+
+ chip = card->private_data;
/* power up */
snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D0);