--- zzzz-none-000/linux-3.10.107/drivers/input/mouse/cypress_ps2.c 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/drivers/input/mouse/cypress_ps2.c 2021-02-04 17:41:59.000000000 +0000 @@ -15,7 +15,6 @@ * the Free Software Foundation. */ -#include #include #include #include @@ -539,7 +538,7 @@ pos[i].y = contact->y; } - input_mt_assign_slots(input, slots, pos, n); + input_mt_assign_slots(input, slots, pos, n, 0); for (i = 0; i < n; i++) { contact = &report_data.contacts[i]; @@ -665,15 +664,15 @@ { struct cytp_data *cytp; - cytp = (struct cytp_data *)kzalloc(sizeof(struct cytp_data), GFP_KERNEL); - psmouse->private = (void *)cytp; - if (cytp == NULL) + cytp = kzalloc(sizeof(struct cytp_data), GFP_KERNEL); + if (!cytp) return -ENOMEM; - cypress_reset(psmouse); - + psmouse->private = cytp; psmouse->pktsize = 8; + cypress_reset(psmouse); + if (cypress_query_hardware(psmouse)) { psmouse_err(psmouse, "Unable to query Trackpad hardware.\n"); goto err_exit; @@ -711,8 +710,3 @@ return -1; } - -bool cypress_supported(void) -{ - return true; -}