From 8992b4db60df591e70f6246408c9b02df23370f8 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Mon, 18 Dec 2006 14:39:02 +0100 Subject: [PATCH] --- yaml --- r: 47155 b: refs/heads/master c: 0664d888a55ff99c8556690a3ae7c76dc1389008 h: refs/heads/master i: 47153: 56b87dfd5508bca7a92065e23571af6532ec9967 47151: b7ae7c80ecad08fd8d3c6b84ae63e89c1f726653 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-core.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 76d0ccc371af..3f8797e124cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 659eacc55a378066b60896b2bbd261ca32a10c04 +refs/heads/master: 0664d888a55ff99c8556690a3ae7c76dc1389008 diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 0bae14145a03..9f23901fc85c 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -2,8 +2,12 @@ * soc-core.c -- ALSA SoC Audio Layer * * Copyright 2005 Wolfson Microelectronics PLC. + * Copyright 2005 Openedhand Ltd. + * * Author: Liam Girdwood * liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com + * with code, comments and ideas from :- + * Richard Purdie * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -517,7 +521,8 @@ static int soc_hw_match_params(struct snd_pcm_substream *substream, * Check we have matching bitclocks. If we don't then it means the * sysclock returned by either the codec or cpu DAI (selected by the * machine sysclock function) is wrong compared with the supported DAI - * modes for the codec or cpu DAI. + * modes for the codec or cpu DAI. Check your codec or CPU DAI + * config_sysclock() functions. */ if (cpu_bclk != codec_bclk && cpu_bclk){ printk(KERN_ERR