Commit 2969869b authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'for-linus' into next 

Merge for-linus branch to sync Elan touchscreen driver code.
parents 04e49867 d34fced4

drivers/input/evdev.c

+4 −15
Original line number Diff line number Diff line
@@ -327,20 +327,6 @@ static int evdev_fasync(int fd, struct file *file, int on) 
	return fasync_helper(fd, file, on, &client->fasync);

}



static int evdev_flush(struct file *file, fl_owner_t id)

{

	struct evdev_client *client = file->private_data;

	struct evdev *evdev = client->evdev;



	mutex_lock(&evdev->mutex);



	if (evdev->exist && !client->revoked)

		input_flush_device(&evdev->handle, file);



	mutex_unlock(&evdev->mutex);

	return 0;

}



static void evdev_free(struct device *dev)

{

	struct evdev *evdev = container_of(dev, struct evdev, dev);
@@ -454,6 +440,10 @@ static int evdev_release(struct inode *inode, struct file *file) 
	unsigned int i;



	mutex_lock(&evdev->mutex);



	if (evdev->exist && !client->revoked)

		input_flush_device(&evdev->handle, file);



	evdev_ungrab(evdev, client);

	mutex_unlock(&evdev->mutex);
@@ -1311,7 +1301,6 @@ static const struct file_operations evdev_fops = { 
	.compat_ioctl	= evdev_ioctl_compat,

#endif

	.fasync		= evdev_fasync,

	.flush		= evdev_flush,

	.llseek		= no_llseek,

};

drivers/input/joystick/xpad.c

+12 −0
Original line number Diff line number Diff line
@@ -458,6 +458,16 @@ static const u8 xboxone_fw2015_init[] = { 
	0x05, 0x20, 0x00, 0x01, 0x00

};



/*

 * This packet is required for Xbox One S (0x045e:0x02ea)

 * and Xbox One Elite Series 2 (0x045e:0x0b00) pads to

 * initialize the controller that was previously used in

 * Bluetooth mode.

 */

static const u8 xboxone_s_init[] = {

	0x05, 0x20, 0x00, 0x0f, 0x06

};



/*

 * This packet is required for the Titanfall 2 Xbox One pads

 * (0x0e6f:0x0165) to finish initialization and for Hori pads
@@ -516,6 +526,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = { 
	XBOXONE_INIT_PKT(0x0e6f, 0x0165, xboxone_hori_init),

	XBOXONE_INIT_PKT(0x0f0d, 0x0067, xboxone_hori_init),

	XBOXONE_INIT_PKT(0x0000, 0x0000, xboxone_fw2015_init),

	XBOXONE_INIT_PKT(0x045e, 0x02ea, xboxone_s_init),

	XBOXONE_INIT_PKT(0x045e, 0x0b00, xboxone_s_init),

	XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init1),

	XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init2),

	XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),

drivers/input/keyboard/applespi.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ struct touchpad_protocol { 
	u8			number_of_fingers;

	u8			clicked2;

	u8			unknown3[16];

	struct tp_finger	fingers[0];

	struct tp_finger	fingers[];

};



/**

drivers/input/keyboard/cros_ec_keyb.c

+5 −9
Original line number Diff line number Diff line
@@ -347,18 +347,14 @@ static int cros_ec_keyb_info(struct cros_ec_device *ec_dev, 
	params->info_type = info_type;

	params->event_type = event_type;



	ret = cros_ec_cmd_xfer(ec_dev, msg);

	if (ret < 0) {

		dev_warn(ec_dev->dev, "Transfer error %d/%d: %d\n",

			 (int)info_type, (int)event_type, ret);

	} else if (msg->result == EC_RES_INVALID_VERSION) {

	ret = cros_ec_cmd_xfer_status(ec_dev, msg);

	if (ret == -ENOTSUPP) {

		/* With older ECs we just return 0 for everything */

		memset(result, 0, result_size);

		ret = 0;

	} else if (msg->result != EC_RES_SUCCESS) {

		dev_warn(ec_dev->dev, "Error getting info %d/%d: %d\n",

			 (int)info_type, (int)event_type, msg->result);

		ret = -EPROTO;

	} else if (ret < 0) {

		dev_warn(ec_dev->dev, "Transfer error %d/%d: %d\n",

			 (int)info_type, (int)event_type, ret);

	} else if (ret != result_size) {

		dev_warn(ec_dev->dev, "Wrong size %d/%d: %d != %zu\n",

			 (int)info_type, (int)event_type,

drivers/input/keyboard/dlink-dir685-touchkeys.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ MODULE_DEVICE_TABLE(of, dir685_tk_of_match); 


static struct i2c_driver dir685_tk_i2c_driver = {

	.driver = {

		.name	= "dlin-dir685-touchkeys",

		.name	= "dlink-dir685-touchkeys",

		.of_match_table = of_match_ptr(dir685_tk_of_match),

	},

	.probe		= dir685_tk_probe,