Commit 0aba0ab8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'pm-sleep'

* pm-sleep:
  PM / wakeirq: check that wake IRQ is valid before accepting it
parents 9832bf3a 6f9b36cd
...@@ -68,6 +68,9 @@ int dev_pm_set_wake_irq(struct device *dev, int irq) ...@@ -68,6 +68,9 @@ int dev_pm_set_wake_irq(struct device *dev, int irq)
struct wake_irq *wirq; struct wake_irq *wirq;
int err; int err;
if (irq < 0)
return -EINVAL;
wirq = kzalloc(sizeof(*wirq), GFP_KERNEL); wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
if (!wirq) if (!wirq)
return -ENOMEM; return -ENOMEM;
...@@ -167,6 +170,9 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq) ...@@ -167,6 +170,9 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
struct wake_irq *wirq; struct wake_irq *wirq;
int err; int err;
if (irq < 0)
return -EINVAL;
wirq = kzalloc(sizeof(*wirq), GFP_KERNEL); wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
if (!wirq) if (!wirq)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment