diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-08 15:58:25 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-08 15:58:25 +0100 |
commit | 17a4adbe68c8e6c1fde8decb2345dc4acea87934 (patch) | |
tree | 16d772ee8b5904ad9b92e1514e131bc504a079ae /sound/soc/codecs/wm8994.c | |
parent | ALSA: hda - Keep power link on for PantherPoint HDMI (diff) | |
parent | ALSA: Fix card refcount unbalance (diff) | |
download | linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.tar.xz linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 3fddc7ad1127..b2b2b37131bd 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3722,7 +3722,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) } while (count--); if (count == 0) - dev_warn(codec->dev, "No impedence range reported for jack\n"); + dev_warn(codec->dev, "No impedance range reported for jack\n"); #ifndef CONFIG_SND_SOC_WM8994_MODULE trace_snd_soc_jack_irq(dev_name(codec->dev)); |