diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 17:40:58 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 17:40:58 -0800 |
commit | 9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch) | |
tree | 15c4222de2a2b2814c9430dcb4e997b18597881c /sound/soc | |
parent | 7c2db36e730ee4facd341679ecb21ee73ba92831 (diff) | |
parent | df63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff) | |
download | linux-3.10-9afa3195b96da7d2320ec44d19fbfbded7a15571.tar.gz linux-3.10-9afa3195b96da7d2320ec44d19fbfbded7a15571.tar.bz2 linux-3.10-9afa3195b96da7d2320ec44d19fbfbded7a15571.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Assorted tiny fixes queued in trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits)
DocBook: update EXPORT_SYMBOL entry to point at export.h
Documentation: update top level 00-INDEX file with new additions
ARM: at91/ide: remove unsused at91-ide Kconfig entry
percpu_counter.h: comment code for better readability
x86, efi: fix comment typo in head_32.S
IB: cxgb3: delay freeing mem untill entirely done with it
net: mvneta: remove unneeded version.h include
time: x86: report_lost_ticks doesn't exist any more
pcmcia: avoid static analysis complaint about use-after-free
fs/jfs: Fix typo in comment : 'how may' -> 'how many'
of: add missing documentation for of_platform_populate()
btrfs: remove unnecessary cur_trans set before goto loop in join_transaction
sound: soc: Fix typo in sound/codecs
treewide: Fix typo in various drivers
btrfs: fix comment typos
Update ibmvscsi module name in Kconfig.
powerpc: fix typo (utilties -> utilities)
of: fix spelling mistake in comment
h8300: Fix home page URL in h8300/README
xtensa: Fix home page URL in Kconfig
...
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/ab8500-codec.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8974.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/wm8978.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/wm8983.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/wm8985.c | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 6c12ac206ee..a153b168129 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2147,7 +2147,7 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) status = ab8500_codec_set_dai_clock_gate(codec, fmt); if (status) { dev_err(dai->codec->dev, - "%s: ERRROR: Failed to set clock gate (%d).\n", + "%s: ERROR: Failed to set clock gate (%d).\n", __func__, status); return status; } diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index ea58b73e86b..b47c252ef90 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -113,15 +113,15 @@ SOC_ENUM("Equaliser Function", wm8974_enum[3]), SOC_ENUM("EQ1 Cut Off", wm8974_enum[4]), SOC_SINGLE_TLV("EQ1 Volume", WM8974_EQ1, 0, 24, 1, eq_tlv), -SOC_ENUM("Equaliser EQ2 Bandwith", wm8974_enum[5]), +SOC_ENUM("Equaliser EQ2 Bandwidth", wm8974_enum[5]), SOC_ENUM("EQ2 Cut Off", wm8974_enum[6]), SOC_SINGLE_TLV("EQ2 Volume", WM8974_EQ2, 0, 24, 1, eq_tlv), -SOC_ENUM("Equaliser EQ3 Bandwith", wm8974_enum[7]), +SOC_ENUM("Equaliser EQ3 Bandwidth", wm8974_enum[7]), SOC_ENUM("EQ3 Cut Off", wm8974_enum[8]), SOC_SINGLE_TLV("EQ3 Volume", WM8974_EQ3, 0, 24, 1, eq_tlv), -SOC_ENUM("Equaliser EQ4 Bandwith", wm8974_enum[9]), +SOC_ENUM("Equaliser EQ4 Bandwidth", wm8974_enum[9]), SOC_ENUM("EQ4 Cut Off", wm8974_enum[10]), SOC_SINGLE_TLV("EQ4 Volume", WM8974_EQ4, 0, 24, 1, eq_tlv), diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index f347af3a67c..029f31c8e70 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -166,15 +166,15 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = { SOC_ENUM("EQ1 Cut Off", eq1), SOC_SINGLE_TLV("EQ1 Volume", WM8978_EQ1, 0, 24, 1, eq_tlv), - SOC_ENUM("Equaliser EQ2 Bandwith", eq2bw), + SOC_ENUM("Equaliser EQ2 Bandwidth", eq2bw), SOC_ENUM("EQ2 Cut Off", eq2), SOC_SINGLE_TLV("EQ2 Volume", WM8978_EQ2, 0, 24, 1, eq_tlv), - SOC_ENUM("Equaliser EQ3 Bandwith", eq3bw), + SOC_ENUM("Equaliser EQ3 Bandwidth", eq3bw), SOC_ENUM("EQ3 Cut Off", eq3), SOC_SINGLE_TLV("EQ3 Volume", WM8978_EQ3, 0, 24, 1, eq_tlv), - SOC_ENUM("Equaliser EQ4 Bandwith", eq4bw), + SOC_ENUM("Equaliser EQ4 Bandwidth", eq4bw), SOC_ENUM("EQ4 Cut Off", eq4), SOC_SINGLE_TLV("EQ4 Volume", WM8978_EQ4, 0, 24, 1, eq_tlv), diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c index c9c707b8698..aa41ba0dfff 100644 --- a/sound/soc/codecs/wm8983.c +++ b/sound/soc/codecs/wm8983.c @@ -353,13 +353,13 @@ static const struct snd_kcontrol_new wm8983_snd_controls[] = { SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put), SOC_ENUM("EQ1 Cutoff", eq1_cutoff), SOC_SINGLE_TLV("EQ1 Volume", WM8983_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv), - SOC_ENUM("EQ2 Bandwith", eq2_bw), + SOC_ENUM("EQ2 Bandwidth", eq2_bw), SOC_ENUM("EQ2 Cutoff", eq2_cutoff), SOC_SINGLE_TLV("EQ2 Volume", WM8983_EQ2_PEAK_1, 0, 24, 1, eq_tlv), - SOC_ENUM("EQ3 Bandwith", eq3_bw), + SOC_ENUM("EQ3 Bandwidth", eq3_bw), SOC_ENUM("EQ3 Cutoff", eq3_cutoff), SOC_SINGLE_TLV("EQ3 Volume", WM8983_EQ3_PEAK_2, 0, 24, 1, eq_tlv), - SOC_ENUM("EQ4 Bandwith", eq4_bw), + SOC_ENUM("EQ4 Bandwidth", eq4_bw), SOC_ENUM("EQ4 Cutoff", eq4_cutoff), SOC_SINGLE_TLV("EQ4 Volume", WM8983_EQ4_PEAK_3, 0, 24, 1, eq_tlv), SOC_ENUM("EQ5 Cutoff", eq5_cutoff), diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index dd6ce3bc01c..18f2babe109 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -371,13 +371,13 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = { SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put), SOC_ENUM("EQ1 Cutoff", eq1_cutoff), SOC_SINGLE_TLV("EQ1 Volume", WM8985_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv), - SOC_ENUM("EQ2 Bandwith", eq2_bw), + SOC_ENUM("EQ2 Bandwidth", eq2_bw), SOC_ENUM("EQ2 Cutoff", eq2_cutoff), SOC_SINGLE_TLV("EQ2 Volume", WM8985_EQ2_PEAK_1, 0, 24, 1, eq_tlv), - SOC_ENUM("EQ3 Bandwith", eq3_bw), + SOC_ENUM("EQ3 Bandwidth", eq3_bw), SOC_ENUM("EQ3 Cutoff", eq3_cutoff), SOC_SINGLE_TLV("EQ3 Volume", WM8985_EQ3_PEAK_2, 0, 24, 1, eq_tlv), - SOC_ENUM("EQ4 Bandwith", eq4_bw), + SOC_ENUM("EQ4 Bandwidth", eq4_bw), SOC_ENUM("EQ4 Cutoff", eq4_cutoff), SOC_SINGLE_TLV("EQ4 Volume", WM8985_EQ4_PEAK_3, 0, 24, 1, eq_tlv), SOC_ENUM("EQ5 Cutoff", eq5_cutoff), |