[gentoo-commits] linux-patches r1641 - genpatches-2.6/trunk/2.6.31

[gentoo-commits] linux-patches r1641 - genpatches-2.6/trunk/2.6.31

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2009-12-12 17:32:27 +0000 (Sat, 12 Dec 2009)
New Revision: 1641

Added:
   genpatches-2.6/trunk/2.6.31/2720_juli-suspend-resume-fix.patch
Modified:
   genpatches-2.6/trunk/2.6.31/0000_README
Log:
Patch for suspend/resume for ESI Juli

Modified: genpatches-2.6/trunk/2.6.31/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.31/0000_README	2009-12-08 22:17:18 UTC (rev 1640)
+++ genpatches-2.6/trunk/2.6.31/0000_README	2009-12-12 17:32:27 UTC (rev 1641)
@@ -91,6 +91,14 @@
 From:	http://bugs.gentoo.org/show_bug.cgi?id=293181
 Desc:	Patch for suspend/resume for Audiotrak Prodigy HD2
 
+Patch:  2900_makefile-changes.patch
+From:   http://www.kernel.org
+Desc:   Minor patch to makefile from Linux 2.6.31.5
+
+Patch:	2720_juli-suspend-resume-fix.patch
+From:	http://bugs.gentoo.org/show_bug.cgi?id=293181
+Desc:	Patch for suspend/resume for ESI Juli
+
 Patch:	4100_dm-bbr.patch
 From:	EVMS 2.5.2
 Desc:	Bad block relocation support for LiveCD users
@@ -103,7 +111,3 @@
 From:	Tavis Ormandy <taviso@gentoo.org> and http://bugs.gentoo.org/show_bug.cgi?id=217323
 Desc:	Enable control of the unaligned access control policy from sysctl
 
-Patch:  2900_makefile-changes.patch
-From:   http://www.kernel.org
-Desc:   Minor patch to makefile from Linux 2.6.31.5
-

Added: genpatches-2.6/trunk/2.6.31/2720_juli-suspend-resume-fix.patch
===================================================================
--- genpatches-2.6/trunk/2.6.31/2720_juli-suspend-resume-fix.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.31/2720_juli-suspend-resume-fix.patch	2009-12-12 17:32:27 UTC (rev 1641)
@@ -0,0 +1,67 @@
+From: Aleksey Kunitskiy <alexey.kv@gmail.com>
+Date: Sat, 14 Nov 2009 13:18:54 +0000 (+0200)
+Subject: ALSA: ice1724 - Patch for suspend/resume for ESI Juli@
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=50d40f187f9182ee8caa1b83f80a0e11e2226baa
+
+ALSA: ice1724 - Patch for suspend/resume for ESI Juli@
+
+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>
+---
+
+diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
+index fd948bf..f5020ad 100644
+--- a/sound/pci/ice1712/juli.c
++++ b/sound/pci/ice1712/juli.c
+@@ -504,6 +504,31 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice)
+ }
+ 
+ /*
++ * 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;
+ }
+ 
+