View | Details | Raw Unified | Return to bug 14970
Collapse All | Expand All

(-)a/drivers/input/mouse/psmouse-base.c (-13 / +10 lines)
Lines 690-708 static int psmouse_extensions(struct psmouse *psmouse, Link Here
690
		max_proto = PSMOUSE_IMEX;
690
		max_proto = PSMOUSE_IMEX;
691
	}
691
	}
692
692
693
/*
694
 * Try Finger Sensing Pad
695
 */
696
	if (max_proto > PSMOUSE_IMEX) {
697
		if (fsp_detect(psmouse, set_properties) == 0) {
698
			if (!set_properties || fsp_init(psmouse) == 0)
699
				return PSMOUSE_FSP;
700
/*
701
 * Init failed, try basic relative protocols
702
 */
703
			max_proto = PSMOUSE_IMEX;
704
		}
705
	}
706
693
707
	if (max_proto > PSMOUSE_IMEX) {
694
	if (max_proto > PSMOUSE_IMEX) {
708
		if (genius_detect(psmouse, set_properties) == 0)
695
		if (genius_detect(psmouse, set_properties) == 0)
Lines 719-724 static int psmouse_extensions(struct psmouse *psmouse, Link Here
719
	}
706
	}
720
707
721
/*
708
/*
709
 * Try Finger Sensing Pad
710
 */
711
	if (max_proto > PSMOUSE_IMEX) {
712
		if (fsp_detect(psmouse, set_properties) == 0) {
713
			if (!set_properties || fsp_init(psmouse) == 0)
714
				return PSMOUSE_FSP;
715
		}
716
	}
717
718
/*
722
 * Reset to defaults in case the device got confused by extended
719
 * Reset to defaults in case the device got confused by extended
723
 * protocol probes. Note that we follow up with full reset because
720
 * protocol probes. Note that we follow up with full reset because
724
 * some mice put themselves to sleep when they see PSMOUSE_RESET_DIS.
721
 * some mice put themselves to sleep when they see PSMOUSE_RESET_DIS.

Return to bug 14970