summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-27 17:51:52 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-27 17:51:52 +0000
commita164612eb6562d211e7fc67890df42753da7dfa0 (patch)
tree7626b2127e79ea02e9672b6e0e723a8f3882e797 /sound
parent8b08c0fe95060bba87e98ae6308b90441698a878 (diff)
parentd08935711b542c3fe5c51abf290e172536d4cf09 (diff)
downloadop-kernel-dev-a164612eb6562d211e7fc67890df42753da7dfa0.zip
op-kernel-dev-a164612eb6562d211e7fc67890df42753da7dfa0.tar.gz
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 50f5c78..499730a 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -110,7 +110,7 @@ static void pop_dbg(struct device *dev, u32 pop_time, const char *fmt, ...)
va_start(args, fmt);
vsnprintf(buf, PAGE_SIZE, fmt, args);
- dev_info(dev, buf);
+ dev_info(dev, "%s", buf);
va_end(args);
kfree(buf);
OpenPOWER on IntegriCloud