Merge branch 'for-linus' into next (c114dc5e) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/input/misc/uinput.c

+20 −2

Original line number	Diff line number	Diff line
		@@ -1051,13 +1051,31 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

		#ifdef CONFIG_COMPAT

		#define UI_SET_PHYS_COMPAT _IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t)
		/*
		* These IOCTLs change their size and thus their numbers between
		* 32 and 64 bits.
		*/
		#define UI_SET_PHYS_COMPAT \
		_IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t)
		#define UI_BEGIN_FF_UPLOAD_COMPAT \
		_IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload_compat)
		#define UI_END_FF_UPLOAD_COMPAT \
		_IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload_compat)

		static long uinput_compat_ioctl(struct file *file,
		unsigned int cmd, unsigned long arg)
		{
		if (cmd == UI_SET_PHYS_COMPAT)
		switch (cmd) {
		case UI_SET_PHYS_COMPAT:
		cmd = UI_SET_PHYS;
		break;
		case UI_BEGIN_FF_UPLOAD_COMPAT:
		cmd = UI_BEGIN_FF_UPLOAD;
		break;
		case UI_END_FF_UPLOAD_COMPAT:
		cmd = UI_END_FF_UPLOAD;
		break;
		}

		return uinput_ioctl_handler(file, cmd, arg, compat_ptr(arg));
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -981,6 +981,8 @@ static irqreturn_t elan_isr(int irq, void *dev_id)
		if (error)
		goto out;

		pm_wakeup_event(dev, 0);

		switch (report[ETP_REPORT_ID_OFFSET]) {
		case ETP_REPORT_ID:
		elan_report_absolute(data, report);

+2 −0

Original line number	Diff line number	Diff line
		@@ -1189,6 +1189,8 @@ static const char * const middle_button_pnp_ids[] = {
		"LEN2132", /* ThinkPad P52 */
		"LEN2133", /* ThinkPad P72 w/ NFC */
		"LEN2134", /* ThinkPad P72 */
		"LEN0407",
		"LEN0408",
		NULL
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -617,6 +617,7 @@ static const struct acpi_device_id silead_ts_acpi_match[] = {
		{ "MSSL1680", 0 },
		{ "MSSL0001", 0 },
		{ "MSSL0002", 0 },
		{ "MSSL0017", 0 },
		{ }
		};
		MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match);