diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-21 17:03:19 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-21 17:03:19 (GMT) |
| commit | 36766835ed17f0a10039272693d3c17e8f8a5142 (patch) | |
| tree | deeaee624d39b959ee2e5235b4f54f9436f7b43b | |
| parent | 15c2ac051c730210b7ef2c93807b576e89e129d2 (diff) | |
| parent | 55fe27f7e2c9d24ce870136bd99ae67b020122d1 (diff) | |
| download | linux-fsl-qoriq-36766835ed17f0a10039272693d3c17e8f8a5142.tar.xz | |
Merge branch 'fix/ctxfi' into for-linus
* fix/ctxfi:
ALSA: ctxfi: Swapped SURROUND-SIDE channels on emu20k2
| -rw-r--r-- | sound/pci/ctxfi/ctdaio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c index 082e35c..deb6cfa 100644 --- 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}, |