From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 May 2018 03:34:42 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v5.15~8917
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ecd649b3408408841d5793038b0241e55ac7a141;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull input updates from Dmitry Torokhov:
 "Just a few driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: atmel_mxt_ts - add missing compatible strings to OF device table
  Input: atmel_mxt_ts - fix the firmware update
  Input: atmel_mxt_ts - add touchpad button mapping for Samsung Chromebook Pro
  MAINTAINERS: Rakesh Iyer can't be reached anymore
  Input: hideep_ts - fix a typo in Kconfig
  Input: alps - fix reporting pressure of v3 trackstick
  Input: leds - fix out of bound access
  Input: synaptics-rmi4 - fix an unchecked out of memory error path
---

ecd649b3408408841d5793038b0241e55ac7a141
diff --cc drivers/input/touchscreen/atmel_mxt_ts.c
index 5d9699f,f04e4fb..0919472
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@@ -279,8 -273,10 +279,9 @@@ struct mxt_data 
  	struct i2c_client *client;
  	struct input_dev *input_dev;
  	char phys[64];		/* device physical location */
 -	const struct mxt_platform_data *pdata;
  	struct mxt_object *object_table;
- 	struct mxt_info info;
+ 	struct mxt_info *info;
+ 	void *raw_info_block;
  	unsigned int irq;
  	unsigned int max_x;
  	unsigned int max_y;