summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-02 12:41:40 +0400
committerTakashi Iwai <tiwai@suse.de>2011-05-02 12:41:40 +0400
commita3ea8e8f2474c35b4c3e22262991afddb93c4c0e (patch)
tree648bbeea304950d02e71863673be8154a5e491f6 /sound/pci/hda/hda_codec.c
parentc2de187e5b0f25b572ac1cb6cdf383f16123717d (diff)
parentebb47241ea0eac6a5a23404821a2d62f64c68496 (diff)
downloadlinux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.xz
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 10f429f96163..2c40e415852b 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3730,7 +3730,7 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)
* with the proper parameters for set up.
* ops.cleanup should be called in hw_free for clean up of streams.
*
- * This function returns 0 if successfull, or a negative error code.
+ * This function returns 0 if successful, or a negative error code.
*/
int __devinit snd_hda_build_pcms(struct hda_bus *bus)
{
@@ -4923,7 +4923,7 @@ EXPORT_SYMBOL_HDA(snd_hda_suspend);
*
* Returns 0 if successful.
*
- * This fucntion is defined only when POWER_SAVE isn't set.
+ * This function is defined only when POWER_SAVE isn't set.
* In the power-save mode, the codec is resumed dynamically.
*/
int snd_hda_resume(struct hda_bus *bus)