History

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

Linus Torvalds committed 3 years ago

Commit d6b78222 parents 622322f 5dc63e52 files · +7 −0Browse files

Unified · Split

2 files
  1. drivers/input/tablet/pegasus_notetaker.c +6 −0
  2. drivers/input/touchscreen/cyttsp5.c +1 −0
drivers/input/tablet/pegasus_notetaker.c+6−0
@@ -296,6 +296,12 @@ static int pegasus_probe(struct usb_interface *intf, · 295 unmodified lines
296 pegasus->intf = intf;296 pegasus->intf = intf;
297 297
298 pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);298 pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
299 /* Sanity check that pipe's type matches endpoint's type */
300 if (usb_pipe_type_check(dev, pipe)) {
301 error = -EINVAL;
302 goto err_free_mem;
303 }
304
299 pegasus->data_len = usb_maxpacket(dev, pipe);305 pegasus->data_len = usb_maxpacket(dev, pipe);
300 306
301 pegasus->data = usb_alloc_coherent(dev, pegasus->data_len, GFP_KERNEL,307 pegasus->data = usb_alloc_coherent(dev, pegasus->data_len, GFP_KERNEL,
drivers/input/touchscreen/cyttsp5.c+1−0
@@ -111,6 +111,7 @@ struct cyttsp5_sensing_conf_data_dev { · 110 unmodified lines
111 __le16 max_z;111 __le16 max_z;
112 u8 origin_x;112 u8 origin_x;
113 u8 origin_y;113 u8 origin_y;
114 u8 panel_id;
114 u8 btn;115 u8 btn;
115 u8 scan_mode;116 u8 scan_mode;
116 u8 max_num_of_tch_per_refresh_cycle;117 u8 max_num_of_tch_per_refresh_cycle;