Merge branch 'fix/ctxfi' into for-linus

* fix/ctxfi: ALSA: ctxfi: Swapped SURROUND-SIDE channels on emu20k2

Merge branch 'fix/ctxfi' into for-linus
* fix/ctxfi: ALSA: ctxfi: Swapped SURROUND-SIDE channels on emu20k2
36766835 · Takashi Iwai · 15c2ac05 · 55fe27f7 · 36766835
Commit 36766835 authored Jul 21, 2009 by Takashi Iwai
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/pci/ctxfi/ctdaio.c sound/pci/ctxfi/ctdaio.c +2 -2

No files found.
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -57,9 +57,9 @@ struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = {

 struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = {
 	[LINEO1] = {.left = 0x40, .right = 0x41},
-	[LINEO2] = {.left = 0x70, .right = 0x71},
+	[LINEO2] = {.left = 0x60, .right = 0x61},
 	[LINEO3] = {.left = 0x50, .right = 0x51},
-	[LINEO4] = {.left = 0x60, .right = 0x61},
+	[LINEO4] = {.left = 0x70, .right = 0x71},
 	[LINEIM] = {.left = 0x45, .right = 0xc5},
 	[SPDIFOO] = {.left = 0x00, .right = 0x01},
 	[SPDIFIO] = {.left = 0x05, .right = 0x85},