Commit c01ad408 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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.
parents 90a800de cca23d0b

drivers/input/evdev.c

+2 −1
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ static void evdev_event(struct input_handle *handle, 


	rcu_read_unlock();



	if (type == EV_SYN && code == SYN_REPORT)

		wake_up_interruptible(&evdev->wait);

}

drivers/input/input.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

		mt_slots = dev->absinfo[ABS_MT_TRACKING_ID].maximum -

			   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)) {

		mt_slots = 2;

	} else {

drivers/input/keyboard/omap-keypad.c

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static void omap_kp_tasklet(unsigned long data) 
#endif

		}

	}

	input_sync(omap_kp_data->input);

	memcpy(keypad_state, new_state, sizeof(keypad_state));



	if (key_down) {

drivers/input/keyboard/sh_keysc.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static const struct { 
	[SH_KEYSC_MODE_3] = { 2, 4, 7 },

	[SH_KEYSC_MODE_4] = { 3, 6, 6 },

	[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 {

drivers/input/mousedev.c

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void mousedev_abs_event(struct input_dev *dev, struct mousedev *mousedev, 
		if (size == 0)

			size = xres ? : 1;



		clamp(value, min, max);

		value = clamp(value, min, max);



		mousedev->packet.x = ((value - min) * xres) / size;

		mousedev->packet.abs_event = 1;
@@ -201,7 +201,7 @@ static void mousedev_abs_event(struct input_dev *dev, struct mousedev *mousedev, 
		if (size == 0)

			size = yres ? : 1;



		clamp(value, min, max);

		value = clamp(value, min, max);



		mousedev->packet.y = yres - ((value - min) * yres) / size;

		mousedev->packet.abs_event = 1;