Skip to content

Commit

Permalink
ASoC: Don't fail if we can't read the IRQ type in WM8903
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Dec 6, 2011
1 parent 5d680b3 commit 6664ee1
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions sound/soc/codecs/wm8903.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down

0 comments on commit 6664ee1

Please sign in to comment.