aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-core.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 0bae14145a03..9f23901fc85c 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2,8 +2,12 @@
2 * soc-core.c -- ALSA SoC Audio Layer 2 * soc-core.c -- ALSA SoC Audio Layer
3 * 3 *
4 * Copyright 2005 Wolfson Microelectronics PLC. 4 * Copyright 2005 Wolfson Microelectronics PLC.
5 * Copyright 2005 Openedhand Ltd.
6 *
5 * Author: Liam Girdwood 7 * Author: Liam Girdwood
6 * liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com 8 * liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
9 * with code, comments and ideas from :-
10 * Richard Purdie <richard@openedhand.com>
7 * 11 *
8 * This program is free software; you can redistribute it and/or modify it 12 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the 13 * under the terms of the GNU General Public License as published by the
@@ -517,7 +521,8 @@ found:
517 * Check we have matching bitclocks. If we don't then it means the 521 * Check we have matching bitclocks. If we don't then it means the
518 * sysclock returned by either the codec or cpu DAI (selected by the 522 * sysclock returned by either the codec or cpu DAI (selected by the
519 * machine sysclock function) is wrong compared with the supported DAI 523 * machine sysclock function) is wrong compared with the supported DAI
520 * modes for the codec or cpu DAI. 524 * modes for the codec or cpu DAI. Check your codec or CPU DAI
525 * config_sysclock() functions.
521 */ 526 */
522 if (cpu_bclk != codec_bclk && cpu_bclk){ 527 if (cpu_bclk != codec_bclk && cpu_bclk){
523 printk(KERN_ERR 528 printk(KERN_ERR