diff options
Diffstat (limited to 'drivers/input/keyboard/imx_keypad.c')
| -rw-r--r-- | drivers/input/keyboard/imx_keypad.c | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index 3cd47fa44efc..069c1d6376e1 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -183,7 +183,8 @@ static void imx_keypad_fire_events(struct imx_keypad *keypad,   */  static void imx_keypad_check_for_events(struct timer_list *t)  { -	struct imx_keypad *keypad = from_timer(keypad, t, check_matrix_timer); +	struct imx_keypad *keypad = timer_container_of(keypad, t, +						       check_matrix_timer);  	unsigned short matrix_volatile_state[MAX_MATRIX_KEY_COLS];  	unsigned short reg_val;  	bool state_changed, is_zero_matrix;  | 
