diff --git a/[refs] b/[refs]
index cf7e66339f21..564cad8bab64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52ad48a0ce25d4d44ce82b7e28a35eb69598e5f1
+refs/heads/master: 92aab96034c2cdf11eb61a6b14409c2da8e5158d
diff --git a/trunk/drivers/input/keyboard/imx_keypad.c b/trunk/drivers/input/keyboard/imx_keypad.c
index 7ad74517654b..6d150e3e1f55 100644
--- a/trunk/drivers/input/keyboard/imx_keypad.c
+++ b/trunk/drivers/input/keyboard/imx_keypad.c
@@ -362,7 +362,8 @@ static void imx_keypad_inhibit(struct imx_keypad *keypad)
 	writew(reg_val, keypad->mmio_base + KPSR);
 
 	/* Colums as open drain and disable all rows */
-	writew(0xff00, keypad->mmio_base + KPCR);
+	reg_val = (keypad->cols_en_mask & 0xff) << 8;
+	writew(reg_val, keypad->mmio_base + KPCR);
 }
 
 static void imx_keypad_close(struct input_dev *dev)