Merge branch 'for-next' into topic/hda-core

1 files changed, 4 insertions, 4 deletions

diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
index 5cc356db5351..e061355f535f 100644
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp.c
@@ -166,10 +166,10 @@ int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s,
          * One AMDTP packet can include some frames. In blocking mode, the
          * number equals to SYT_INTERVAL. So the number is 8, 16 or 32,
          * depending on its sampling rate. For accurate period interrupt, it's
-         * preferrable to aligh period/buffer sizes to current SYT_INTERVAL.
+         * preferrable to align period/buffer sizes to current SYT_INTERVAL.
          *
-         * TODO: These constraints can be improved with propper rules.
-         * Currently apply LCM of SYT_INTEVALs.
+         * TODO: These constraints can be improved with proper rules.
+         * Currently apply LCM of SYT_INTERVALs.
          */
         err = snd_pcm_hw_constraint_step(runtime, 0,
                                          SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 32);
@@ -270,7 +270,7 @@ static void amdtp_read_s32(struct amdtp_stream *s,
  * @s: the AMDTP stream to configure
  * @format: the format of the ALSA PCM device
  *
- * The sample format must be set after the other paramters (rate/PCM channels/
+ * The sample format must be set after the other parameters (rate/PCM channels/
  * MIDI) and before the stream is started, and must not be changed while the
  * stream is running.
  */