aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ctxfi
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-20 17:08:01 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-20 17:08:01 +0200
commit9c6c529a21cd3b6efb367256a239eec4153721c0 (patch)
tree8233ebf48f18cd458fcdda99798c4317a3f17735 /sound/pci/ctxfi
parentbc5304b6fb6c572452b538512761a126f0e0b0d8 (diff)
parent55fe27f7e2c9d24ce870136bd99ae67b020122d1 (diff)
downloadkernel_samsung_smdk4412-9c6c529a21cd3b6efb367256a239eec4153721c0.zip
kernel_samsung_smdk4412-9c6c529a21cd3b6efb367256a239eec4153721c0.tar.gz
kernel_samsung_smdk4412-9c6c529a21cd3b6efb367256a239eec4153721c0.tar.bz2
Merge branch 'fix/ctxfi' into topic/ctxfi
Diffstat (limited to 'sound/pci/ctxfi')
-rw-r--r--sound/pci/ctxfi/ctdaio.c4
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},