From da817197a2c04c9c0f071ea8d023539a52cdc765 Mon Sep 17 00:00:00 2001 From: Andreas Pretzsch Date: Sat, 24 Nov 2012 23:31:38 -0800 Subject: [PATCH] --- yaml --- r: 346959 b: refs/heads/master c: 92aab96034c2cdf11eb61a6b14409c2da8e5158d h: refs/heads/master i: 346957: 5b53fca1abce19dfe2077c4a509bdcf7c449898b 346955: 0be52210607c83b67ab21a947a9b4b868d0c40dd 346951: f4d612f28d129a7d1c9dbd4f9ddb8fbb03fc5bcf 346943: a64cb9bf0eb1bcdfac19eb8ef8b056e8e89c1ef4 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/imx_keypad.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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)