Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/scsi/fcoe/fcoe.c

1 files changed, 9 insertions, 11 deletions

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index d3fa41e3d8c5..17d7afe42b83 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -758,8 +758,12 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
 
         /* Workaround for clearing DSP GPIO interrupts to allow retention */
 #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
+        reg = bank->base + OMAP24XX_GPIO_IRQSTATUS2;
         if (cpu_is_omap24xx() || cpu_is_omap34xx())
-                __raw_writel(gpio_mask, bank->base + OMAP24XX_GPIO_IRQSTATUS2);
+                __raw_writel(gpio_mask, reg);
+
+        /* Flush posted write for the irq status to avoid spurious interrupts */
+        __raw_readl(reg);
 #endif
 }
 
@@ -921,13 +925,10 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
         case METHOD_MPUIO:
         case METHOD_GPIO_1610:
                 spin_lock_irqsave(&bank->lock, flags);
-                if (enable) {
+                if (enable)
                         bank->suspend_wakeup |= (1 << gpio);
-                        enable_irq_wake(bank->irq);
-                } else {
-                        disable_irq_wake(bank->irq);
+                else
                         bank->suspend_wakeup &= ~(1 << gpio);
-                }
                 spin_unlock_irqrestore(&bank->lock, flags);
                 return 0;
 #endif
@@ -940,13 +941,10 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
                         return -EINVAL;
                 }
                 spin_lock_irqsave(&bank->lock, flags);
-                if (enable) {
+                if (enable)
                         bank->suspend_wakeup |= (1 << gpio);
-                        enable_irq_wake(bank->irq);
-                } else {
-                        disable_irq_wake(bank->irq);
+                else
                         bank->suspend_wakeup &= ~(1 << gpio);
-                }
                 spin_unlock_irqrestore(&bank->lock, flags);
                 return 0;
 #endif