summaryrefslogtreecommitdiffstats
path: root/sound/pci/trident/trident.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 16:09:25 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-03 12:27:37 +0100
commitfb0700b4debbf45fb0465b40188bdc5396947bda (patch)
tree6a314571cd81b9995de254932ab7fe37038fa7b5 /sound/pci/trident/trident.c
parentcb28e45ba2aa42393596a364d4f947027db8a1b5 (diff)
downloadlinux-fb0700b4debbf45fb0465b40188bdc5396947bda.tar.gz
linux-fb0700b4debbf45fb0465b40188bdc5396947bda.tar.bz2
linux-fb0700b4debbf45fb0465b40188bdc5396947bda.zip
[ALSA] trident - Fix PM support
Modules: Trident driver Fix PM support on Trident driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/trident/trident.c')
-rw-r--r--sound/pci/trident/trident.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index 0999f1f83a99..2b21df16ad6a 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -100,6 +100,7 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
snd_card_free(card);
return err;
}
+ card->private_data = trident;
switch (trident->device) {
case TRIDENT_DEVICE_ID_DX:
@@ -180,7 +181,10 @@ static struct pci_driver driver = {
.id_table = snd_trident_ids,
.probe = snd_trident_probe,
.remove = __devexit_p(snd_trident_remove),
- SND_PCI_PM_CALLBACKS
+#ifdef CONFIG_PM
+ .suspend = snd_trident_suspend,
+ .resume = snd_trident_resume,
+#endif
};
static int __init alsa_card_trident_init(void)