---

yaml --- r: 358759 b: refs/heads/master c: 1107ca1 h: refs/heads/master i: 358757: a1a7b69 358755: 609dfa5 358751: e91ad34 v: v3
git-mirror · Feb 4, 2013 · e2b42c5 · e2b42c5
1 parent 9b35c3e
commit e2b42c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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);