Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / sound / pci / oxygen / hifier.c

diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c
index 6e45a58ad14bdf3aafc16b63d9c76334d50a9feb..7442460583dde0c68f92f40c965afe8cbb461272 100644 (file)
--- a/sound/pci/oxygen/hifier.c
+++ b/sound/pci/oxygen/hifier.c
@@ -146,6 +146,7 @@ static const struct oxygen_model model_hifier = {
        .init = hifier_init,
        .control_filter = hifier_control_filter,
        .cleanup = hifier_cleanup,
+       .resume = hifier_registers_init,
        .set_dac_params = set_ak4396_params,
        .set_adc_params = set_cs5340_params,
        .update_dac_volume = update_ak4396_volume,
@@ -186,6 +187,10 @@ static struct pci_driver hifier_driver = {
        .id_table = hifier_ids,
        .probe = hifier_probe,
        .remove = __devexit_p(oxygen_pci_remove),
+#ifdef CONFIG_PM
+       .suspend = oxygen_pci_suspend,
+       .resume = oxygen_pci_resume,
+#endif
 };
 
 static int __init alsa_card_hifier_init(void)