summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8903.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-06 10:30:24 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-06 10:30:24 +0000
commit6664ee115bb45d912d64d1c6b26bd3b96ef7df09 (patch)
treecfaee63f894e4534490f5cfe94e934553e07a85d /sound/soc/codecs/wm8903.c
parent5d680b3a84b3e870fc1ea01495935e58e17de7aa (diff)
downloadlinux-6664ee115bb45d912d64d1c6b26bd3b96ef7df09.tar.bz2
ASoC: Don't fail if we can't read the IRQ type in WM8903
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@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
-rw-r--r--sound/soc/codecs/wm8903.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index adfbefaaab21..21b9fdc18319 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;