diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-28 22:32:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-28 22:32:10 +0100 |
| commit | d832f3dcb6e2d153fbb69b91931058d138bc41cb (patch) | |
| tree | b58210600b92bbe0c20c02724a47068682b99d5e /sound/pci | |
| parent | ALSA: usx2y: Move UAPI definition into include/uapi/sound/usb_stream.h (diff) | |
| parent | ALSA: ak411x: Fix race of reinit() calls (diff) | |
| download | linux-d832f3dcb6e2d153fbb69b91931058d138bc41cb.tar.xz linux-d832f3dcb6e2d153fbb69b91931058d138bc41cb.zip | |
Merge branch 'topic/ak411x-fix' into for-next
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/ice1712/juli.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index a1536c1a7ed4..4f0213427152 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c @@ -491,15 +491,17 @@ static int juli_resume(struct snd_ice1712 *ice) /* akm4358 un-reset, un-mute */ snd_akm4xxx_reset(ak, 0); /* reinit ak4114 */ - snd_ak4114_reinit(spec->ak4114); + snd_ak4114_resume(spec->ak4114); return 0; } static int juli_suspend(struct snd_ice1712 *ice) { struct snd_akm4xxx *ak = ice->akm; + struct juli_spec *spec = ice->spec; /* akm4358 reset and soft-mute */ snd_akm4xxx_reset(ak, 1); + snd_ak4114_suspend(spec->ak4114); return 0; } #endif |