lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: sh_keysc - 8x8 MODE_6 fix
  Input: omap-keypad - add missing input_sync()
  Input: evdev - try to wake up readers only if we have full packet
  Input: properly assign return value of clamp() macro.
This commit is contained in:
Linus Torvalds
2011-06-20 08:59:46 -07:00
parent 90a800de0a cca23d0b53
commit c01ad40819
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/input/evdev.c
View File

@@ -111,6 +111,7 @@ static void evdev_event(struct input_handle *handle,
rcu_read_unlock(); rcu_read_unlock();
if (type == EV_SYN && code == SYN_REPORT)
wake_up_interruptible(&evdev->wait); wake_up_interruptible(&evdev->wait);
} }

2
drivers/input/input.c
View File

@@ -1756,7 +1756,7 @@ static unsigned int input_estimate_events_per_packet(struct input_dev *dev)
} else if (test_bit(ABS_MT_TRACKING_ID, dev->absbit)) { } else if (test_bit(ABS_MT_TRACKING_ID, dev->absbit)) {
mt_slots = dev->absinfo[ABS_MT_TRACKING_ID].maximum - mt_slots = dev->absinfo[ABS_MT_TRACKING_ID].maximum -
dev->absinfo[ABS_MT_TRACKING_ID].minimum + 1, dev->absinfo[ABS_MT_TRACKING_ID].minimum + 1,
clamp(mt_slots, 2, 32); mt_slots = clamp(mt_slots, 2, 32);
} else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) { } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
mt_slots = 2; mt_slots = 2;
} else { } else {

1
drivers/input/keyboard/omap-keypad.c
View File

@@ -209,6 +209,7 @@ static void omap_kp_tasklet(unsigned long data)
#endif #endif
} }
} }
input_sync(omap_kp_data->input);
memcpy(keypad_state, new_state, sizeof(keypad_state)); memcpy(keypad_state, new_state, sizeof(keypad_state));
if (key_down) { if (key_down) {

2
drivers/input/keyboard/sh_keysc.c
View File

@@ -32,7 +32,7 @@ static const struct {
[SH_KEYSC_MODE_3] = { 2, 4, 7 }, [SH_KEYSC_MODE_3] = { 2, 4, 7 },
[SH_KEYSC_MODE_4] = { 3, 6, 6 }, [SH_KEYSC_MODE_4] = { 3, 6, 6 },
[SH_KEYSC_MODE_5] = { 4, 6, 7 }, [SH_KEYSC_MODE_5] = { 4, 6, 7 },
[SH_KEYSC_MODE_6] = { 5, 7, 7 }, [SH_KEYSC_MODE_6] = { 5, 8, 8 },
}; };
struct sh_keysc_priv { struct sh_keysc_priv {

4
drivers/input/mousedev.c
View File

@@ -187,7 +187,7 @@ static void mousedev_abs_event(struct input_dev *dev, struct mousedev *mousedev,
if (size == 0) if (size == 0)
size = xres ? : 1; size = xres ? : 1;
clamp(value, min, max); value = clamp(value, min, max);
mousedev->packet.x = ((value - min) * xres) / size; mousedev->packet.x = ((value - min) * xres) / size;
mousedev->packet.abs_event = 1; mousedev->packet.abs_event = 1;
@@ -201,7 +201,7 @@ static void mousedev_abs_event(struct input_dev *dev, struct mousedev *mousedev,
if (size == 0) if (size == 0)
size = yres ? : 1; size = yres ? : 1;
clamp(value, min, max); value = clamp(value, min, max);
mousedev->packet.y = yres - ((value - min) * yres) / size; mousedev->packet.y = yres - ((value - min) * yres) / size;
mousedev->packet.abs_event = 1; mousedev->packet.abs_event = 1;

2
include/linux/input/sh_keysc.h
View File

@@ -1,7 +1,7 @@
#ifndef __SH_KEYSC_H__ #ifndef __SH_KEYSC_H__
#define __SH_KEYSC_H__ #define __SH_KEYSC_H__
#define SH_KEYSC_MAXKEYS 49 #define SH_KEYSC_MAXKEYS 64
struct sh_keysc_info { struct sh_keysc_info {
enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3, enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3,