[alsa-devel] [PATCH] ASoC: Don't fail if we can't read the IRQ type in WM8903

Mark Brown broonie at opensource.wolfsonmicro.com
Tue Dec 6 11:48:12 CET 2011


If we fail to read the IRQ type from the interrupt controller don't
fail, just assume a value and solider on - we may fail later when we try
to request the IRQ but it's possible we'll succeed.

Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm8903.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index adfbefa..21b9fdc 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -2049,6 +2049,7 @@ static int wm8903_set_pdata_irq_trigger(struct i2c_client *i2c,
 
 	switch (irqd_get_trigger_type(irq_data)) {
 	case IRQ_TYPE_NONE:
+	default:
 		/*
 		* We assume the controller imposes no restrictions,
 		* so we are able to select active-high
@@ -2060,11 +2061,6 @@ static int wm8903_set_pdata_irq_trigger(struct i2c_client *i2c,
 	case IRQ_TYPE_LEVEL_LOW:
 		pdata->irq_active_low = true;
 		break;
-	default:
-		dev_err(&i2c->dev,
-			"Unsupported IRQ_TYPE %x\n",
-			irqd_get_trigger_type(irq_data));
-		return -EINVAL;
 	}
 
 	return 0;
-- 
1.7.7.3



More information about the Alsa-devel mailing list