From 332fe72583af223997117b7fa4a8e846c473713c Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Fri, 31 Dec 2010 09:48:20 +0800 Subject: [PATCH] --- yaml --- r: 227882 b: refs/heads/master c: 456dc301cc3b547b2a674de3028f53fb1453e532 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/intel_pmic_gpio.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1c67ed09c2ae..483a16ebfcd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 213658516fd5e125eb7a97995f6cae8996f8015b +refs/heads/master: 456dc301cc3b547b2a674de3028f53fb1453e532 diff --git a/trunk/drivers/platform/x86/intel_pmic_gpio.c b/trunk/drivers/platform/x86/intel_pmic_gpio.c index e61db9dfebef..930e62762365 100644 --- a/trunk/drivers/platform/x86/intel_pmic_gpio.c +++ b/trunk/drivers/platform/x86/intel_pmic_gpio.c @@ -244,7 +244,11 @@ static void pmic_irq_handler(unsigned irq, struct irq_desc *desc) generic_handle_irq(pg->irq_base + gpio); } } - desc->chip->eoi(irq); + + if (desc->chip->irq_eoi) + desc->chip->irq_eoi(irq_get_irq_data(irq)); + else + dev_warn(pg->chip.dev, "missing EOI handler for irq %d\n", irq); } static int __devinit platform_pmic_gpio_probe(struct platform_device *pdev)