From e2b42c5498fc937562153183f96a3dc5055bc3b2 Mon Sep 17 00:00:00 2001 From: Mathias Nyman Date: Mon, 4 Feb 2013 11:32:22 +0200 Subject: [PATCH] --- yaml --- r: 358759 b: refs/heads/master c: 1107ca104f0331627f6446bfefa2d4b0e673db18 h: refs/heads/master i: 358757: a1a7b690a4d1b06dd158e932325f6d24a39092e4 358755: 609dfa50a5e0a686b0a27e52da68d5c0f269523a 358751: e91ad345e9330675d295fa8b64ab7d573d831f03 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpiolib-acpi.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1612fc0969ff..c9b99141e40a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de0ccf788147440eee2383c74408080f3ff0a43b +refs/heads/master: 1107ca104f0331627f6446bfefa2d4b0e673db18 diff --git a/trunk/drivers/gpio/gpiolib-acpi.c b/trunk/drivers/gpio/gpiolib-acpi.c index 54ce2269ed25..a063eb04b6ce 100644 --- a/trunk/drivers/gpio/gpiolib-acpi.c +++ b/trunk/drivers/gpio/gpiolib-acpi.c @@ -83,7 +83,8 @@ void acpi_gpiochip_request_interrupts(struct gpio_chip *chip) struct acpi_resource *res; acpi_handle handle, ev_handle; acpi_status status; - unsigned int pin, irq; + unsigned int pin; + int irq, ret; char ev_name[5]; if (!chip->dev || !chip->to_irq) @@ -126,11 +127,15 @@ void acpi_gpiochip_request_interrupts(struct gpio_chip *chip) continue; /* Assume BIOS sets the triggering, so no flags */ - devm_request_threaded_irq(chip->dev, irq, NULL, + ret = devm_request_threaded_irq(chip->dev, irq, NULL, acpi_gpio_irq_handler, 0, "GPIO-signaled-ACPI-event", ev_handle); + if (ret) + dev_err(chip->dev, + "Failed to request IRQ %d ACPI event handler\n", + irq); } } EXPORT_SYMBOL(acpi_gpiochip_request_interrupts);