Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 209296
b: refs/heads/master
c: b84ae4a
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Mack authored and Linus Torvalds committed Aug 13, 2010
1 parent 0eedd55 commit 219cf88
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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: e259f191f2244df04a7746fac1df8aa68ebd0106
refs/heads/master: b84ae4a1401a731ef5fee987c0cb08743838dda7
2 changes: 1 addition & 1 deletion trunk/drivers/input/joystick/amijoy.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static int __init amijoy_init(void)
amijoy_dev[i]->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
for (j = 0; j < 2; j++) {
XXinput_set_abs_params(amijoy_dev[i], ABS_X + j,
input_set_abs_params(amijoy_dev[i], ABS_X + j,
-1, 1, 0, 0);
}

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/input/keyboard/hil_kbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ static void hil_dev_handle_ptr_events(struct hil_dev *ptr)
if (val < input_abs_min(dev, ABS_X + i))
input_abs_set_min(dev, ABS_X + i, val);
if (val > input_abs_max(dev, ABS_X + i))
XXinput_abs_set_max(dev, ABS_X + i, val);
input_abs_set_max(dev, ABS_X + i, val);
#endif
if (i % 3)
val = input_abs_max(dev, ABS_X + i) - val;
Expand Down Expand Up @@ -391,7 +391,7 @@ static void hil_dev_pointer_setup(struct hil_dev *ptr)
int diff = input_abs_max(input_dev, ABS_X + i) / 10;
input_abs_set_min(input_dev, ABS_X + i,
input_abs_min(input_dev, ABS_X + i) + diff)
XXinput_abs_set_max(input_dev, ABS_X + i,
input_abs_set_max(input_dev, ABS_X + i,
input_abs_max(input_dev, ABS_X + i) - diff)
}
#endif
Expand Down

0 comments on commit 219cf88

Please sign in to comment.