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

Commit adf11b62 authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'for_3.5/fixes/gpio-2' of... 

Merge branch 'for_3.5/fixes/gpio-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
parents d6de85e8 b3c64bc3

drivers/gpio/gpio-omap.c

+4 −5
Original line number Diff line number Diff line
@@ -1157,9 +1157,6 @@ static int omap_gpio_runtime_suspend(struct device *dev) 


	spin_lock_irqsave(&bank->lock, flags);



	if (!bank->enabled_non_wakeup_gpios)

		goto update_gpio_context_count;



	/*

	 * Only edges can generate a wakeup event to the PRCM.

	 *
@@ -1180,6 +1177,9 @@ static int omap_gpio_runtime_suspend(struct device *dev) 
		__raw_writel(wake_hi | bank->context.risingdetect,

			     bank->base + bank->regs->risingdetect);



	if (!bank->enabled_non_wakeup_gpios)

		goto update_gpio_context_count;



	if (bank->power_mode != OFF_MODE) {

		bank->power_mode = 0;

		goto update_gpio_context_count;
@@ -1238,8 +1238,7 @@ static int omap_gpio_runtime_resume(struct device *dev) 
	if (bank->get_context_loss_count) {

		context_lost_cnt_after =

			bank->get_context_loss_count(bank->dev);

		if (context_lost_cnt_after != bank->context_loss_count ||

						!context_lost_cnt_after) {

		if (context_lost_cnt_after != bank->context_loss_count) {

			omap_gpio_restore_context(bank);

		} else {

			spin_unlock_irqrestore(&bank->lock, flags);