From 911411029e488ac5748b688c71ea6167c3946d65 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Wed, 28 Nov 2012 12:39:01 +0900 Subject: [PATCH] --- yaml --- r: 354949 b: refs/heads/master c: ae3b3215f8e16ee8234024c77787bac9befb4f4c h: refs/heads/master i: 354947: 2b336b657ebdfe03c2943821806214eec5b0119b v: v3 --- [refs] | 2 +- trunk/drivers/extcon/extcon-max77693.c | 4 ++-- trunk/drivers/extcon/extcon-max8997.c | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cda11ac102b6..aec991a7da40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 297620fd1e14edf5fefa1736f873b9228336eee1 +refs/heads/master: ae3b3215f8e16ee8234024c77787bac9befb4f4c diff --git a/trunk/drivers/extcon/extcon-max77693.c b/trunk/drivers/extcon/extcon-max77693.c index 10f41f3d5be4..7b7f1a2a0846 100644 --- a/trunk/drivers/extcon/extcon-max77693.c +++ b/trunk/drivers/extcon/extcon-max77693.c @@ -1006,13 +1006,13 @@ static int max77693_muic_probe(struct platform_device *pdev) ret = request_threaded_irq(virq, NULL, max77693_muic_irq_handler, - IRQF_ONESHOT, muic_irq->name, info); + IRQF_NO_SUSPEND, + muic_irq->name, info); if (ret) { dev_err(&pdev->dev, "failed: irq request (IRQ: %d," " error :%d)\n", muic_irq->irq, ret); - goto err_irq; } } diff --git a/trunk/drivers/extcon/extcon-max8997.c b/trunk/drivers/extcon/extcon-max8997.c index 93009fe6ef05..df9358e30814 100644 --- a/trunk/drivers/extcon/extcon-max8997.c +++ b/trunk/drivers/extcon/extcon-max8997.c @@ -459,8 +459,10 @@ static int max8997_muic_probe(struct platform_device *pdev) } muic_irq->virq = virq; - ret = request_threaded_irq(virq, NULL, max8997_muic_irq_handler, - 0, muic_irq->name, info); + ret = request_threaded_irq(virq, NULL, + max8997_muic_irq_handler, + IRQF_NO_SUSPEND, + muic_irq->name, info); if (ret) { dev_err(&pdev->dev, "failed: irq request (IRQ: %d,"