From: Dan Carpenter Date: Thu, 29 Nov 2012 14:38:35 +0000 (+0300) Subject: staging: panel: pass correct lengths to keypad_send_key() X-Git-Tag: upstream/snapshot3+hdmi~6135^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a171516c3490fed2a06bc621f9ef5cc1e0e6749e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git staging: panel: pass correct lengths to keypad_send_key() We changed the sizeof() statements in 429ccf058b "staging:panel: Fixed coding conventions." so that they could fit inside the 80 character line limit. Unfortunately, the new sizeof() statements are a smaller size. This reverts it. There isn't a nice way to stay within the 80 character limit without a re-work so I've gone over. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index 6e9f709..e3113ec 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c @@ -1758,7 +1758,7 @@ static inline int input_state_high(struct logical_input *input) char *press_str = input->u.kbd.press_str; if (press_str[0]) keypad_send_key(press_str, - sizeof(press_str)); + sizeof(input->u.kbd.press_str)); } if (input->u.kbd.repeat_str[0]) { @@ -1766,7 +1766,7 @@ static inline int input_state_high(struct logical_input *input) if (input->high_timer >= KEYPAD_REP_START) { input->high_timer -= KEYPAD_REP_DELAY; keypad_send_key(repeat_str, - sizeof(repeat_str)); + sizeof(input->u.kbd.repeat_str)); } /* we will need to come back here soon */ inputs_stable = 0; @@ -1805,7 +1805,7 @@ static inline void input_state_falling(struct logical_input *input) if (input->high_timer >= KEYPAD_REP_START) input->high_timer -= KEYPAD_REP_DELAY; keypad_send_key(repeat_str, - sizeof(repeat_str)); + sizeof(input->u.kbd.repeat_str)); /* we will need to come back here soon */ inputs_stable = 0; } @@ -1824,7 +1824,7 @@ static inline void input_state_falling(struct logical_input *input) char *release_str = input->u.kbd.release_str; if (release_str[0]) keypad_send_key(release_str, - sizeof(release_str)); + sizeof(input->u.kbd.release_str)); } input->state = INPUT_ST_LOW;