Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78e372e6 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 

Pull input fixes from Dmitry Torokhov:
 "A fixup for the input_event fix for y2038 Sparc64, and couple other
  minor fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: input_event - fix the CONFIG_SPARC64 mixup
  Input: olpc_apsp - assign priv->dev earlier
  Input: uinput - fix undefined behavior in uinput_validate_absinfo()
  Input: raspberrypi-ts - fix link error
  Input: xpad - add support for SteelSeries Stratus Duo
  Input: input_event - provide override for sparc64
parents 037222ad 141e5dca

drivers/input/joystick/xpad.c

+3 −0
Original line number Diff line number Diff line
@@ -252,6 +252,8 @@ static const struct xpad_device { 
	{ 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX },

	{ 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },

	{ 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX },

	{ 0x1038, 0x1430, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },

	{ 0x1038, 0x1431, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },

	{ 0x11c9, 0x55f0, "Nacon GC-100XF", 0, XTYPE_XBOX360 },

	{ 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x12ab, 0x0301, "PDP AFTERGLOW AX.1", 0, XTYPE_XBOX360 },
@@ -428,6 +430,7 @@ static const struct usb_device_id xpad_table[] = { 
	XPAD_XBOXONE_VENDOR(0x0e6f),		/* 0x0e6f X-Box One controllers */

	XPAD_XBOX360_VENDOR(0x0f0d),		/* Hori Controllers */

	XPAD_XBOXONE_VENDOR(0x0f0d),		/* Hori Controllers */

	XPAD_XBOX360_VENDOR(0x1038),		/* SteelSeries Controllers */

	XPAD_XBOX360_VENDOR(0x11c9),		/* Nacon GC100XF */

	XPAD_XBOX360_VENDOR(0x12ab),		/* X-Box 360 dance pads */

	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane X-Box 360 controllers */

drivers/input/misc/uinput.c

+3 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/init.h>

#include <linux/fs.h>

#include <linux/miscdevice.h>

#include <linux/overflow.h>

#include <linux/input/mt.h>

#include "../input-compat.h"
@@ -405,7 +406,7 @@ static int uinput_open(struct inode *inode, struct file *file) 
static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code,

				   const struct input_absinfo *abs)

{

	int min, max;

	int min, max, range;



	min = abs->minimum;

	max = abs->maximum;
@@ -417,7 +418,7 @@ static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code, 
		return -EINVAL;

	}



	if (abs->flat > max - min) {

	if (!check_sub_overflow(max, min, &range) && abs->flat > range) {

		printk(KERN_DEBUG

		       "%s: abs_flat #%02x out of range: %d (min:%d/max:%d)\n",

		       UINPUT_NAME, code, abs->flat, min, max);

drivers/input/serio/olpc_apsp.c

+2 −1
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ static int olpc_apsp_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	priv->dev = &pdev->dev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(priv->base)) {
@@ -248,7 +250,6 @@ static int olpc_apsp_probe(struct platform_device *pdev) 
		goto err_irq;

	}



	priv->dev = &pdev->dev;

	device_init_wakeup(priv->dev, 1);

	platform_set_drvdata(pdev, priv);

drivers/input/touchscreen/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ config TOUCHSCREEN_EDT_FT5X06 


config TOUCHSCREEN_RASPBERRYPI_FW

	tristate "Raspberry Pi's firmware base touch screen support"

	depends on RASPBERRYPI_FIRMWARE || COMPILE_TEST

	depends on RASPBERRYPI_FIRMWARE || (RASPBERRYPI_FIRMWARE=n && COMPILE_TEST)

	help

	  Say Y here if you have the official Raspberry Pi 7 inch screen on

	  your system.

include/uapi/linux/input.h

+5 −1
Original line number Diff line number Diff line
@@ -26,13 +26,17 @@ 
 */



struct input_event {

#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL)

#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL__)

	struct timeval time;

#define input_event_sec time.tv_sec

#define input_event_usec time.tv_usec

#else

	__kernel_ulong_t __sec;

#if defined(__sparc__) && defined(__arch64__)

	unsigned int __usec;

#else

	__kernel_ulong_t __usec;

#endif

#define input_event_sec  __sec

#define input_event_usec __usec

#endif