Merge branch 'pm-sleep'

* pm-sleep: PM / wakeirq: check that wake IRQ is valid before accepting it

Merge branch 'pm-sleep'
* pm-sleep: PM / wakeirq: check that wake IRQ is valid before accepting it
0aba0ab8 · Rafael J. Wysocki · 9832bf3a · 6f9b36cd · 0aba0ab8
Commit 0aba0ab8 authored Nov 20, 2015 by Rafael J. Wysocki
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

drivers/base/power/wakeirq.c drivers/base/power/wakeirq.c +6 -0

No files found.
--- a/drivers/base/power/wakeirq.c
+++ b/drivers/base/power/wakeirq.c
@@ -68,6 +68,9 @@ int dev_pm_set_wake_irq(struct device *dev, int irq)
 	struct wake_irq *wirq;
 	int err;

+	if (irq < 0)
+		return -EINVAL;
+
 	wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
 	if (!wirq)
 		return -ENOMEM;
@@ -167,6 +170,9 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
 	struct wake_irq *wirq;
 	int err;

+	if (irq < 0)
+		return -EINVAL;
+
 	wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
 	if (!wirq)
 		return -ENOMEM;