diff options
| author | Aleksey Kunitskiy <alexey.kv@gmail.com> | 2009-11-14 15:18:54 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-14 14:32:51 +0100 |
| commit | 50d40f187f9182ee8caa1b83f80a0e11e2226baa (patch) | |
| tree | cfadd8a1eb211ddb0e36aefbe3b1e243c0f22a48 /sound/pci/ice1712 | |
| parent | 401de8184a4d94688962b9258fe10ab309ffda9c (diff) | |
| download | kernel_samsung_espresso10-50d40f187f9182ee8caa1b83f80a0e11e2226baa.zip kernel_samsung_espresso10-50d40f187f9182ee8caa1b83f80a0e11e2226baa.tar.gz kernel_samsung_espresso10-50d40f187f9182ee8caa1b83f80a0e11e2226baa.tar.bz2 | |
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>
Diffstat (limited to 'sound/pci/ice1712')
| -rw-r--r-- | sound/pci/ice1712/juli.c | 32 |
1 files changed, 32 insertions, 0 deletions
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; } |