Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / patch_conexant.c

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index d29d6d37790425924ce818acff4f6402f0fa8e82..f584f6d8ffcccfe1237e8495289cec805b91b9bb 100644 (file)
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1643,7 +1643,7 @@ static void cxt5051_update_speaker(struct hda_codec *codec)
        pinctl = (!spec->hp_present && spec->cur_eapd) ? PIN_OUT : 0;
        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
                            pinctl);
-       /* on ideapad there is an aditional speaker (subwoofer) to mute */
+       /* on ideapad there is an additional speaker (subwoofer) to mute */
        if (spec->ideapad)
                snd_hda_codec_write(codec, 0x1b, 0,
                                    AC_VERB_SET_PIN_WIDGET_CONTROL,