diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 12:50:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 12:50:27 -0400 |
| commit | d0bbe0dd353af9521e9d8bc5236308c677b6f62a (patch) | |
| tree | a1142f3a5058d16504863ac777b21efdf1eca49e /sound | |
| parent | 8de29a35dc840a05e451ad035bcb06e21ccf605f (diff) | |
| parent | 0e4f93e5017d9d8080bbd34db17836e090eb46fe (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Usual trivial tree updates. Nothing outstanding -- mostly printk()
and comment fixes and unused identifier removals"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
goldfish: goldfish_tty_probe() is not using 'i' any more
powerpc: Fix comment in smu.h
qla2xxx: Fix printks in ql_log message
lib: correct link to the original source for div64_u64
si2168, tda10071, m88ds3103: Fix firmware wording
usb: storage: Fix printk in isd200_log_config()
qla2xxx: Fix printk in qla25xx_setup_mode
init/main: fix reset_device comment
ipwireless: missing assignment
goldfish: remove unreachable line of code
coredump: Fix do_coredump() comment
stacktrace.h: remove duplicate declaration task_struct
smpboot.h: Remove unused function prototype
treewide: Fix typo in printk messages
treewide: Fix typo in printk messages
mod_devicetable: fix comment for match_flags
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e5c990889dcc..10f0886e78ec 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -2755,7 +2755,7 @@ int snd_soc_register_component(struct device *dev, | |||
| 2755 | 2755 | ||
| 2756 | ret = snd_soc_register_dais(cmpnt, dai_drv, num_dai, true); | 2756 | ret = snd_soc_register_dais(cmpnt, dai_drv, num_dai, true); |
| 2757 | if (ret < 0) { | 2757 | if (ret < 0) { |
| 2758 | dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret); | 2758 | dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret); |
| 2759 | goto err_cleanup; | 2759 | goto err_cleanup; |
| 2760 | } | 2760 | } |
| 2761 | 2761 | ||
| @@ -3076,7 +3076,7 @@ int snd_soc_register_codec(struct device *dev, | |||
| 3076 | 3076 | ||
| 3077 | ret = snd_soc_register_dais(&codec->component, dai_drv, num_dai, false); | 3077 | ret = snd_soc_register_dais(&codec->component, dai_drv, num_dai, false); |
| 3078 | if (ret < 0) { | 3078 | if (ret < 0) { |
| 3079 | dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret); | 3079 | dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret); |
| 3080 | goto err_cleanup; | 3080 | goto err_cleanup; |
| 3081 | } | 3081 | } |
| 3082 | 3082 | ||