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

Merge branch 'pm-sleep' 

* pm-sleep:
  PM / wakeirq: check that wake IRQ is valid before accepting it
parents 9832bf3a 6f9b36cd

drivers/base/power/wakeirq.c

+6 −0
Original line number Diff line number Diff line
@@ -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;