staging: panel: pass correct lengths to keypad_send_key()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 29 Nov 2012 14:38:35 +0000 (17:38 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 30 Nov 2012 02:16:15 +0000 (18:16 -0800)
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 <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/panel/panel.c

index 6e9f709..e3113ec 100644 (file)
@@ -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;