summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-11-29 17:38:35 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-29 18:16:15 -0800
commita171516c3490fed2a06bc621f9ef5cc1e0e6749e (patch)
tree5a0d88ffb385a40edaceccd1f904c4d3c6871036 /drivers
parent05fcdcede016a74ce7350af94aede6a49eebd5c9 (diff)
downloadlinux-3.10-a171516c3490fed2a06bc621f9ef5cc1e0e6749e.tar.gz
linux-3.10-a171516c3490fed2a06bc621f9ef5cc1e0e6749e.tar.bz2
linux-3.10-a171516c3490fed2a06bc621f9ef5cc1e0e6749e.zip
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 <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/panel/panel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 6e9f7090c45..e3113ecefef 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;