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

(-)work/drivers/input/mouse/psmouse-base.c (-9 / +6 lines)
Lines 527-537 static int psmouse_extensions(struct psm Link Here
527
	if (max_proto > PSMOUSE_IMEX && ps2pp_init(psmouse, set_properties) == 0)
527
	if (max_proto > PSMOUSE_IMEX && ps2pp_init(psmouse, set_properties) == 0)
528
		return PSMOUSE_PS2PP;
528
		return PSMOUSE_PS2PP;
529
529
530
	if (max_proto > PSMOUSE_IMEX && trackpoint_detect(psmouse, set_properties) == 0)
531
		return PSMOUSE_TRACKPOINT;
532
530
/*
533
/*
531
 * Reset to defaults in case the device got confused by extended
534
 * Reset to defaults in case the device got confused by extended
532
 * protocol probes.
535
 * protocol probes. Note that we do full reset becuase some mice
536
 * put themselves to sleep when see PSMOUSE_RESET_DIS.
533
 */
537
 */
534
	ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
538
	psmouse_reset(psmouse);
535
539
536
	if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse, set_properties) == 0)
540
	if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse, set_properties) == 0)
537
		return PSMOUSE_IMEX;
541
		return PSMOUSE_IMEX;
Lines 540-551 static int psmouse_extensions(struct psm Link Here
540
		return PSMOUSE_IMPS;
544
		return PSMOUSE_IMPS;
541
545
542
/*
546
/*
543
 * Try to initialize the IBM TrackPoint
544
 */
545
	if (max_proto > PSMOUSE_IMEX && trackpoint_detect(psmouse, set_properties) == 0)
546
		return PSMOUSE_TRACKPOINT;
547
548
/*
549
 * Okay, all failed, we have a standard mouse here. The number of the buttons
547
 * Okay, all failed, we have a standard mouse here. The number of the buttons
550
 * is still a question, though. We assume 3.
548
 * is still a question, though. We assume 3.
551
 */
549
 */
Lines 559-565 static int psmouse_extensions(struct psm Link Here
559
 * extensions.
557
 * extensions.
560
 */
558
 */
561
		psmouse_reset(psmouse);
559
		psmouse_reset(psmouse);
562
		ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
563
	}
560
	}
564
561
565
	return PSMOUSE_PS2;
562
	return PSMOUSE_PS2;

Return to bug 134690