]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ALSA: ice1724 - Patch for suspend/resume for ESI Juli@
authorAleksey Kunitskiy <alexey.kv@gmail.com>
Sat, 14 Nov 2009 13:18:54 +0000 (15:18 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 14 Nov 2009 13:32:51 +0000 (14:32 +0100)
Add proper suspend/resume code for Juli@ cards. Based on ice1724
suspend/resume work of Igor Chernyshev.
Fixes bug https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4413
Tested on linux-2.6.31.6

Signed-off-by: Aleksey Kunitskiy <alexey.kv@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/ice1712/juli.c

index fd948bfd9aef64ccaf223b84233cd361e7a7bbbb..f5020ad99a10a416ee720d81724dd55ae668bea2 100644 (file)
@@ -503,6 +503,31 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice)
        return 0;
 }
 
+/*
+ * suspend/resume
+ * */
+
+#ifdef CONFIG_PM
+static int juli_resume(struct snd_ice1712 *ice)
+{
+       struct snd_akm4xxx *ak = ice->akm;
+       struct juli_spec *spec = ice->spec;
+       /* akm4358 un-reset, un-mute */
+       snd_akm4xxx_reset(ak, 0);
+       /* reinit ak4114 */
+       snd_ak4114_reinit(spec->ak4114);
+       return 0;
+}
+
+static int juli_suspend(struct snd_ice1712 *ice)
+{
+       struct snd_akm4xxx *ak = ice->akm;
+       /* akm4358 reset and soft-mute */
+       snd_akm4xxx_reset(ak, 1);
+       return 0;
+}
+#endif
+
 /*
  * initialize the chip
  */
@@ -646,6 +671,13 @@ static int __devinit juli_init(struct snd_ice1712 *ice)
        ice->set_spdif_clock = juli_set_spdif_clock;
 
        ice->spdif.ops.open = juli_spdif_in_open;
+
+#ifdef CONFIG_PM
+       ice->pm_resume = juli_resume;
+       ice->pm_suspend = juli_suspend;
+       ice->pm_suspend_enabled = 1;
+#endif
+
        return 0;
 }