Skip to content

Commit

Permalink
Input: tca8418_keypad - add support for shared interrupt
Browse files Browse the repository at this point in the history
Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Alban Bedel authored and Dmitry Torokhov committed Nov 29, 2012
1 parent e89e29b commit bf7f531
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/input/keyboard/tca8418_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -224,16 +224,18 @@ static irqreturn_t tca8418_irq_handler(int irq, void *dev_id)
if (error) {
dev_err(&keypad_data->client->dev,
"unable to read REG_INT_STAT\n");
goto exit;
return IRQ_NONE;
}

if (!reg)
return IRQ_NONE;

if (reg & INT_STAT_OVR_FLOW_INT)
dev_warn(&keypad_data->client->dev, "overflow occurred\n");

if (reg & INT_STAT_K_INT)
tca8418_read_keypad(keypad_data);

exit:
/* Clear all interrupts, even IRQs we didn't check (GPI, CAD, LCK) */
reg = 0xff;
error = tca8418_write_byte(keypad_data, REG_INT_STAT, reg);
Expand Down Expand Up @@ -374,7 +376,9 @@ static int tca8418_keypad_probe(struct i2c_client *client,
client->irq = gpio_to_irq(client->irq);

error = request_threaded_irq(client->irq, NULL, tca8418_irq_handler,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
IRQF_TRIGGER_FALLING |
IRQF_SHARED |
IRQF_ONESHOT,
client->name, keypad_data);
if (error) {
dev_dbg(&client->dev,
Expand Down

0 comments on commit bf7f531

Please sign in to comment.