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

Merge tag 'input-for-v6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:

 - a check in pegasus-notetaker driver to validate the type of pipe when
   probing a new device

 - a fix for Cypress touch controller to correctly parse maximum number
   of touches.

* tag 'input-for-v6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: cyttsp5 - fix sensing configuration data structure
  Input: pegasus-notetaker - check pipe type when probing
parents 622322f5 5dc63e56

drivers/input/tablet/pegasus_notetaker.c

+6 −0
Original line number Diff line number Diff line
@@ -296,6 +296,12 @@ static int pegasus_probe(struct usb_interface *intf, 
	pegasus->intf = intf;



	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);

	/* Sanity check that pipe's type matches endpoint's type */

	if (usb_pipe_type_check(dev, pipe)) {

		error = -EINVAL;

		goto err_free_mem;

	}



	pegasus->data_len = usb_maxpacket(dev, pipe);



	pegasus->data = usb_alloc_coherent(dev, pegasus->data_len, GFP_KERNEL,

drivers/input/touchscreen/cyttsp5.c

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ struct cyttsp5_sensing_conf_data_dev { 
	__le16 max_z;

	u8 origin_x;

	u8 origin_y;

	u8 panel_id;

	u8 btn;

	u8 scan_mode;

	u8 max_num_of_tch_per_refresh_cycle;