Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 230407
b: refs/heads/master
c: cf370a5
h: refs/heads/master
i:
  230405: 90837ce
  230403: dffc21d
  230399: 650b1a5
v: v3
  • Loading branch information
Olaya, Margarita authored and Liam Girdwood committed Dec 14, 2010
1 parent 5830e36 commit bb0f5e9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0dec1ec72317caa64f0174f8190c714ae4d51040
refs/heads/master: cf370a5a0e9d3b111f93216a55f275d66daed952
30 changes: 12 additions & 18 deletions trunk/sound/soc/codecs/twl6040.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,30 +441,24 @@ static irqreturn_t twl6040_naudint_handler(int irq, void *data)

twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &intid, TWL6040_REG_INTID);

switch (intid) {
case TWL6040_THINT:
if (intid & TWL6040_THINT)
dev_alert(codec->dev, "die temp over-limit detection\n");
break;
case TWL6040_PLUGINT:
case TWL6040_UNPLUGINT:

if ((intid & TWL6040_PLUGINT) || (intid & TWL6040_UNPLUGINT))
queue_delayed_work(priv->workqueue, &priv->delayed_work,
msecs_to_jiffies(200));
break;
case TWL6040_HOOKINT:
break;
case TWL6040_HFINT:

if (intid & TWL6040_HOOKINT)
dev_info(codec->dev, "hook detection\n");

if (intid & TWL6040_HFINT)
dev_alert(codec->dev, "hf drivers over current detection\n");
break;
case TWL6040_VIBINT:

if (intid & TWL6040_VIBINT)
dev_alert(codec->dev, "vib drivers over current detection\n");
break;
case TWL6040_READYINT:

if (intid & TWL6040_READYINT)
complete(&priv->ready);
break;
default:
dev_err(codec->dev, "unknown audio interrupt %d\n", intid);
break;
}

return IRQ_HANDLED;
}
Expand Down

0 comments on commit bb0f5e9

Please sign in to comment.