Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e82374fd authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Anton Vorontsov
Browse files

pda_power: Check and handle return value of set_irq_wake 



The recent change in commit 2db87321
forces the calls enable_irq_wake() and disable_irq_wake() to
be balanced. But if in pda_power_suspend() the call to
enable_irq_wake() fails (because attached gpio cannot wake
up the CPU), the corresponding disable_irq_wake will WARN().
Fix it by storing success/failure of enable_irq_wake().

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
parent bef69ea0

drivers/power/pda_power.c

+7 −4
Original line number Diff line number Diff line
@@ -334,13 +334,16 @@ static int pda_power_remove(struct platform_device *pdev) 
}



#ifdef CONFIG_PM

static int ac_wakeup_enabled;

static int usb_wakeup_enabled;



static int pda_power_suspend(struct platform_device *pdev, pm_message_t state)

{

	if (device_may_wakeup(&pdev->dev)) {

		if (ac_irq)

			enable_irq_wake(ac_irq->start);

			ac_wakeup_enabled = !enable_irq_wake(ac_irq->start);

		if (usb_irq)

			enable_irq_wake(usb_irq->start);

			usb_wakeup_enabled = !enable_irq_wake(usb_irq->start);

	}



	return 0;
@@ -349,9 +352,9 @@ static int pda_power_suspend(struct platform_device *pdev, pm_message_t state) 
static int pda_power_resume(struct platform_device *pdev)

{

	if (device_may_wakeup(&pdev->dev)) {

		if (usb_irq)

		if (usb_irq && usb_wakeup_enabled)

			disable_irq_wake(usb_irq->start);

		if (ac_irq)

		if (ac_irq && ac_wakeup_enabled)

			disable_irq_wake(ac_irq->start);

	}