Merge commit 'v3.5-rc3' into x86/debug

Merge it in to pick up a fix that we are going to clean up in this
branch.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index b26395d1634..e8937e7e499 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -673,7 +673,7 @@ static void __nmk_gpio_set_wake(struct nmk_gpio_chip *nmk_chip,
          * wakeup is anyhow controlled by the RIMSC and FIMSC registers.
          */
         if (nmk_chip->sleepmode && on) {
-                __nmk_gpio_set_slpm(nmk_chip, gpio % nmk_chip->chip.base,
+                __nmk_gpio_set_slpm(nmk_chip, gpio % NMK_GPIO_PER_CHIP,
                                     NMK_GPIO_SLPM_WAKEUP_ENABLE);
         }
 
@@ -1246,6 +1246,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
                 ret = PTR_ERR(clk);
                 goto out_unmap;
         }
+        clk_prepare(clk);
 
         nmk_chip = kzalloc(sizeof(*nmk_chip), GFP_KERNEL);
         if (!nmk_chip) {