Merge branch 'pm-sleep'

* pm-sleep: PM / wakeirq: check that wake IRQ is valid before accepting it
git-mirror · Nov 20, 2015 · 0aba0ab · 0aba0ab
2 parents 9832bf3 + 6f9b36c
commit 0aba0ab
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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;