Merge tag 'v3.6-rc4' into next

Linux 3.6-rc4

# gpg: Signature made Sat 01 Sep 2012 10:40:33 AM PDT using RSA key ID 00411886
# gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>"

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/input/keyboard/lm8333.c b/drivers/input/keyboard/lm8333.c
index ca168a6679de..081fd9effa8c 100644
--- a/drivers/input/keyboard/lm8333.c
+++ b/drivers/input/keyboard/lm8333.c
@@ -91,7 +91,7 @@ static void lm8333_key_handler(struct lm8333 *lm8333)
                 return;
         }
 
-        for (i = 0; keys[i] && i < LM8333_FIFO_TRANSFER_SIZE; i++) {
+        for (i = 0; i < LM8333_FIFO_TRANSFER_SIZE && keys[i]; i++) {
                 pressed = keys[i] & 0x80;
                 code = keys[i] & 0x7f;
 
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index c7ae23ead575..5faaf2553e33 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -492,7 +492,7 @@ static int tegra_kbc_start(struct tegra_kbc *kbc)
         unsigned int debounce_cnt;
         u32 val = 0;
 
-        clk_enable(kbc->clk);
+        clk_prepare_enable(kbc->clk);
 
         /* Reset the KBC controller to clear all previous status.*/
         tegra_periph_reset_assert(kbc->clk);
@@ -556,7 +556,7 @@ static void tegra_kbc_stop(struct tegra_kbc *kbc)
         disable_irq(kbc->irq);
         del_timer_sync(&kbc->timer);
 
-        clk_disable(kbc->clk);
+        clk_disable_unprepare(kbc->clk);
 }
 
 static int tegra_kbc_open(struct input_dev *dev)