diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-27 12:51:52 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-27 12:51:52 -0500 |
| commit | a164612eb6562d211e7fc67890df42753da7dfa0 (patch) | |
| tree | 7626b2127e79ea02e9672b6e0e723a8f3882e797 /sound | |
| parent | 8b08c0fe95060bba87e98ae6308b90441698a878 (diff) | |
| parent | d08935711b542c3fe5c51abf290e172536d4cf09 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 50f5c785cb61..499730ab5638 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, ...) | |||
| 110 | 110 | ||
| 111 | va_start(args, fmt); | 111 | va_start(args, fmt); |
| 112 | vsnprintf(buf, PAGE_SIZE, fmt, args); | 112 | vsnprintf(buf, PAGE_SIZE, fmt, args); |
| 113 | dev_info(dev, buf); | 113 | dev_info(dev, "%s", buf); |
| 114 | va_end(args); | 114 | va_end(args); |
| 115 | 115 | ||
| 116 | kfree(buf); | 116 | kfree(buf); |