projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-fix-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[cascardo/linux.git]
/
sound
/
soc
/
samsung
/
i2s.c
diff --git
a/sound/soc/samsung/i2s.c
b/sound/soc/samsung/i2s.c
index
b1a7c5b
..
b5a80c5
100644
(file)
--- a/
sound/soc/samsung/i2s.c
+++ b/
sound/soc/samsung/i2s.c
@@
-1261,6
+1261,8
@@
static int samsung_i2s_probe(struct platform_device *pdev)
ret = -ENOMEM;
goto err;
}
+
+ sec_dai->variant_regs = pri_dai->variant_regs;
sec_dai->dma_playback.dma_addr = regs_base + I2STXDS;
sec_dai->dma_playback.ch_name = "tx-sec";