| From stable-bounces@linux.kernel.org Mon Oct 16 05:37:02 2006 |
| Date: Mon, 16 Oct 2006 14:35:57 +0200 |
| Message-ID: <s5hr6x8a15e.wl%tiwai@suse.de> |
| From: Arnaud Patard <arnaud.patard@rtp-net.org> |
| To: stable@kernel.org |
| MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") |
| Subject: ALSA: emu10k1: Fix outl() in snd_emu10k1_resume_regs() |
| Content-Type: text/plain; charset="us-ascii" |
| |
| From: Arnaud Patard <arnaud.patard@rtp-net.org> |
| |
| [PATCH] ALSA: emu10k1: Fix outl() in snd_emu10k1_resume_regs() |
| |
| The emu10k1 driver saves the A_IOCFG and HCFG register on suspend and restores |
| it on resumes. Unfortunately, this doesn't work as the arguments to outl() are |
| reversed. |
| |
| From: Arnaud Patard <arnaud.patard@rtp-net.org> |
| Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| |
| --- |
| sound/pci/emu10k1/emu10k1_main.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- linux-2.6.18.1.orig/sound/pci/emu10k1/emu10k1_main.c |
| +++ linux-2.6.18.1/sound/pci/emu10k1/emu10k1_main.c |
| @@ -1460,8 +1460,8 @@ void snd_emu10k1_resume_regs(struct snd_ |
| |
| /* resore for spdif */ |
| if (emu->audigy) |
| - outl(emu->port + A_IOCFG, emu->saved_a_iocfg); |
| - outl(emu->port + HCFG, emu->saved_hcfg); |
| + outl(emu->saved_a_iocfg, emu->port + A_IOCFG); |
| + outl(emu->saved_hcfg, emu->port + HCFG); |
| |
| val = emu->saved_ptr; |
| for (reg = saved_regs; *reg != 0xff; reg++) |
