From f4974fcd6f1e19ab78d07396024c3ec84941fed0 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 14 Jul 2011 12:38:18 +0900
Subject: [PATCH] --- yaml --- r: 257597 b: refs/heads/master c:
 3b1af3f8c8f3298170fcbf6ef7971c3aeccc4318 h: refs/heads/master i:   257595:
 1d24fb1bda5ca62addc4a044a716224506d4bacc v: v3

---
 [refs]                          |  2 +-
 trunk/sound/soc/codecs/wm8994.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 09b07975a9a4..0d6cd316afd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3d7615f2a012c5e589209d08e89c4116134c9f4
+refs/heads/master: 3b1af3f8c8f3298170fcbf6ef7971c3aeccc4318
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
index a49222246bf2..3acb1bda6c73 100644
--- a/trunk/sound/soc/codecs/wm8994.c
+++ b/trunk/sound/soc/codecs/wm8994.c
@@ -2874,6 +2874,15 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
+static irqreturn_t wm8994_fifo_error(int irq, void *data)
+{
+	struct snd_soc_codec *codec = data;
+
+	dev_err(codec->dev, "FIFO error\n");
+
+	return IRQ_HANDLED;
+}
+
 static int wm8994_codec_probe(struct snd_soc_codec *codec)
 {
 	struct wm8994 *control;
@@ -2948,6 +2957,9 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 		break;
 	}
 
+	wm8994_request_irq(codec->control_data, WM8994_IRQ_FIFOS_ERR,
+			   wm8994_fifo_error, "FIFO error", codec);
+
 	ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
 				 wm_hubs_dcs_done, "DC servo done",
 				 &wm8994->hubs);
@@ -3210,6 +3222,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 				&wm8994->fll_locked[i]);
 	wm8994_free_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
 			&wm8994->hubs);
+	wm8994_free_irq(codec->control_data, WM8994_IRQ_FIFOS_ERR, codec);
 err:
 	kfree(wm8994);
 	return ret;
@@ -3231,6 +3244,7 @@ static int  wm8994_codec_remove(struct snd_soc_codec *codec)
 
 	wm8994_free_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
 			&wm8994->hubs);
+	wm8994_free_irq(codec->control_data, WM8994_IRQ_FIFOS_ERR, codec);
 
 	switch (control->type) {
 	case WM8994: