From 62da004614f3d6cf54619954ac46c2f637aad8f8 Mon Sep 17 00:00:00 2001 From: Fengguang Wu Date: Wed, 19 Sep 2012 09:41:13 +0800 Subject: [PATCH] --- yaml --- r: 329981 b: refs/heads/master c: 619a1e31f2b190814fcb088c8f2281461fafd396 h: refs/heads/master i: 329979: 90ff909a32ae1ac63f6d198e6ab4246dbe893ad1 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/max8925-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 30d6508e3838..8bda17d472d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09e09069f2564af7c2b1beac46e6e439d4ab61cf +refs/heads/master: 619a1e31f2b190814fcb088c8f2281461fafd396 diff --git a/trunk/drivers/mfd/max8925-core.c b/trunk/drivers/mfd/max8925-core.c index f2ff31f3a2f0..e25a24269d51 100644 --- a/trunk/drivers/mfd/max8925-core.c +++ b/trunk/drivers/mfd/max8925-core.c @@ -547,7 +547,7 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq, goto tsc_irq; } - ret = request_threaded_irq(irq, NULL, max8925_irq, flags, + ret = request_threaded_irq(irq, NULL, max8925_irq, flags | IRQF_ONESHOT, "max8925", chip); if (ret) { dev_err(chip->dev, "Failed to request core IRQ: %d\n", ret); @@ -565,7 +565,7 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq, chip->tsc_irq = pdata->tsc_irq; ret = request_threaded_irq(chip->tsc_irq, NULL, max8925_tsc_irq, - flags, "max8925-tsc", chip); + flags | IRQF_ONESHOT, "max8925-tsc", chip); if (ret) { dev_err(chip->dev, "Failed to request TSC IRQ: %d\n", ret); chip->tsc_irq = 0;