Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338311
b: refs/heads/master
c: a171516
h: refs/heads/master
i:
  338309: fa26fa9
  338307: 5f08251
  338303: 0b7b634
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Nov 30, 2012
1 parent e4df910 commit ad3e479
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 05fcdcede016a74ce7350af94aede6a49eebd5c9
refs/heads/master: a171516c3490fed2a06bc621f9ef5cc1e0e6749e
8 changes: 4 additions & 4 deletions trunk/drivers/staging/panel/panel.c
Original file line number Diff line number Diff line change
Expand Up @@ -1758,15 +1758,15 @@ 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]) {
char *repeat_str = input->u.kbd.repeat_str;
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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down

0 comments on commit ad3e479

Please sign in to comment.