Merge remote-tracking branches 'asoc/topic/ux500' and 'asoc/topic/wm8962' into asoc...

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index a0dd7b05b7d678823694b75efe33c06190e16620..fd2731d171dd02511ecb85d67a1189b509db4c71 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3713,7 +3713,7 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
                                            ARRAY_SIZE(wm8962_dc_measure));
                if (ret != 0)
                        dev_err(&i2c->dev,
-                               "Failed to configure for DC mesurement: %d\n",
+                               "Failed to configure for DC measurement: %d\n",
                                ret);
        }
 

diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 6d5698b25bd4b25c92c128860527245167d665d0..b343efd9be5ba7e9d39fa1cf28f30d41f78b82ce 100644 (file)
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -187,7 +187,7 @@ static int setup_clocking(struct snd_soc_dai *dai,
 
        default:
                dev_err(dai->dev,
-                       "%s: Error: Unsopported inversion (fmt = 0x%x)!\n",
+                       "%s: Error: Unsupported inversion (fmt = 0x%x)!\n",
                        __func__, fmt);
 
                return -EINVAL;
@@ -218,7 +218,7 @@ static int setup_clocking(struct snd_soc_dai *dai,
                break;
 
        default:
-               dev_err(dai->dev, "%s: Error: Unsopported master (fmt = 0x%x)!\n",
+               dev_err(dai->dev, "%s: Error: Unsupported master (fmt = 0x%x)!\n",
                        __func__, fmt);
 
                return -EINVAL;
@@ -374,7 +374,7 @@ static int setup_msp_config(struct snd_pcm_substream *substream,
                break;
 
        default:
-               dev_err(dai->dev, "%s: Error: Unsopported format (%d)!\n",
+               dev_err(dai->dev, "%s: Error: Unsupported format (%d)!\n",
                        __func__, fmt);
                return -EINVAL;
        }